[tracker: 44/44] Merge branch 'gdbus'

[Martyn James Russell <mr src gnome org>]

commit 805f4cbe22de615c80666a90d42ec052e66ffbe0
Merge: 8a713ed 523fea4
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Nov 10 15:59:52 2010 +0000

    Merge branch 'gdbus'

 autogen.sh                                         |    2 +-
 configure.ac                                       |   22 +-
 examples/class-signal/Makefile.am                  |   14 +-
 src/libtracker-bus/.gitignore                      |    1 +
 src/libtracker-bus/Makefile.am                     |   23 +-
 src/libtracker-bus/tracker-bus-fd-cursor.c         |  417 ---------
 src/libtracker-bus/tracker-bus-fd-cursor.h         |   45 -
 src/libtracker-bus/tracker-bus-fd-cursor.vala      |  121 +++
 src/libtracker-bus/tracker-bus-fd-cursor.vapi      |   21 -
 src/libtracker-bus/tracker-bus-fd-update.c         |  877 ------------------
 src/libtracker-bus/tracker-bus-fd-update.h         |   74 --
 src/libtracker-bus/tracker-bus-fd-update.vapi      |   35 -
 src/libtracker-bus/tracker-bus-shared.c            |   83 --
 src/libtracker-bus/tracker-bus-shared.h            |   29 -
 src/libtracker-bus/tracker-bus.vala                |  422 ++++++---
 src/libtracker-client/tracker-sparql-query.vapi    |   52 ++
 src/libtracker-common/tracker-dbus.h               |    2 +
 src/libtracker-data/tracker-sparql-expression.vala |    2 +-
 src/libtracker-data/tracker-sparql-query.vala      |   16 +-
 src/libtracker-data/tracker-sparql-scanner.vala    |    8 +-
 src/libtracker-data/tracker-turtle-reader.vala     |    2 +-
 src/libtracker-direct/Makefile.am                  |    4 +-
 src/libtracker-direct/tracker-direct.vala          |    4 +-
 src/libtracker-sparql/Makefile.am                  |    3 +-
 src/libtracker-sparql/tracker-backend.vala         |  105 +--
 src/libtracker-sparql/tracker-connection.vala      |   40 +-
 src/miners/flickr/tracker-sparql-builder.h         |   58 ++
 src/miners/flickr/tracker-sparql-query.vapi        |   30 +
 src/plugins/evolution/tracker-evolution-plugin.c   |  943 +++++++++-----------
 src/tracker-explorer/tracker-explorer.vala         |    2 +-
 src/tracker-preferences/tracker-preferences.vala   |    8 +-
 src/tracker-search-tool/tracker-entry.gs           |    6 +-
 src/tracker-store/tracker-steroids.c               |   22 +-
 tests/functional-tests/Makefile.am                 |    1 -
 tests/functional-tests/ipc/Makefile.am             |   37 +-
 tests/functional-tests/ipc/test-bus-query.vala     |    9 +-
 tests/functional-tests/ipc/test-bus-update.vala    |    9 +-
 .../ipc/test-class-signal-performance.vala         |    6 +-
 tests/functional-tests/ipc/test-class-signal.vala  |    7 +-
 .../functional-tests/ipc/test-default-update.vala  |   19 +-
 tests/functional-tests/ipc/test-direct-query.vala  |   34 +-
 tests/functional-tests/ipc/test-shared-update.vala |   40 +-
 42 files changed, 1149 insertions(+), 2506 deletions(-)
---