[tracker: 29/29] Merge branch 'async-queries-due'

[Martyn James Russell <mr src gnome org>]

commit 2b4fc49ed66ef6ea83bc8d5babf59a1613493da2
Merge: d20c3ad 52634ce
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Apr 21 14:09:42 2010 +0100

    Merge branch 'async-queries-due'

 configure.ac                                    |    3 +-
 src/libtracker-data/tracker-data-manager.c      |    8 +-
 src/libtracker-data/tracker-data-manager.h      |    2 +
 src/libtracker-data/tracker-data-update.c       |   10 +-
 src/libtracker-data/tracker-data-update.h       |    1 +
 src/libtracker-db/tracker-db-interface-sqlite.c |   24 ++-
 src/libtracker-db/tracker-db-interface.c        |   15 +
 src/libtracker-db/tracker-db-interface.h        |    9 +-
 src/libtracker-db/tracker-db-manager.c          |   87 ++++-
 src/libtracker-db/tracker-db-manager.h          |    3 +
 src/libtracker-fts/tracker-fts.c                |  126 ++++---
 src/libtracker-fts/tracker-fts.h                |    1 +
 src/tracker-store/tracker-events.c              |   23 +-
 src/tracker-store/tracker-store.c               |  445 +++++++++++++++++------
 src/tracker-store/tracker-writeback.c           |   21 +-
 15 files changed, 568 insertions(+), 210 deletions(-)
---