[tracker: 19/19] Merge branch 'cursor'

[Martyn James Russell <mr src gnome org>]

commit 4d08e5eaa81839c84e3913dfde4858f28a1c0289
Merge: ef70cf1 23054f1
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Jan 19 17:25:47 2011 +0000

    Merge branch 'cursor'

 src/libtracker-data/Makefile.am                    |    2 -
 src/libtracker-data/libtracker-data.vapi           |   12 +-
 src/libtracker-data/tracker-data-manager.c         |   75 ++----
 src/libtracker-data/tracker-data-query.c           |   19 --
 src/libtracker-data/tracker-data-query.h           |    2 -
 src/libtracker-data/tracker-data-update.c          |   32 +--
 src/libtracker-data/tracker-data.h                 |    1 -
 src/libtracker-data/tracker-db-dbus.c              |   70 -----
 src/libtracker-data/tracker-db-dbus.h              |   40 ---
 src/libtracker-data/tracker-db-interface-sqlite.c  |  100 +-------
 src/libtracker-data/tracker-db-interface.c         |  275 +-------------------
 src/libtracker-data/tracker-db-interface.h         |   35 +---
 src/libtracker-data/tracker-db-manager.c           |   16 +-
 src/libtracker-data/tracker-sparql-expression.vala |    3 +
 src/libtracker-data/tracker-sparql-pattern.vala    |   28 +--
 src/libtracker-data/tracker-sparql-query.vala      |  102 ++------
 src/miners/fs/tracker-main.c                       |    1 -
 src/tracker-store/tracker-locale-change.c          |    1 -
 src/tracker-store/tracker-main.vala                |   14 +-
 tests/libtracker-data/Makefile.am                  |    4 +-
 tests/libtracker-data/tracker-backup-test.c        |   29 ++-
 tests/libtracker-data/tracker-db-dbus-test.c       |  213 ---------------
 tests/libtracker-data/tracker-db-manager-common.c  |    7 +-
 .../libtracker-data/tracker-ontology-change-test.c |   45 +---
 tests/libtracker-data/tracker-ontology-test.c      |   45 +---
 tests/libtracker-data/tracker-sparql-test.c        |   57 ++---
 tests/libtracker-fts/tracker-fts-test.c            |   45 +---
 utils/tracker-sql/tracker-sql.c                    |  113 ++++----
 28 files changed, 249 insertions(+), 1137 deletions(-)
---