[tracker: 24/24] Merge branch 'clientapi-2'

[Martyn James Russell <mr src gnome org>]

commit 1b15cbe1cea264d07f5b4686b35344411bd77a80
Merge: 3fb684a b320e2a
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jan 14 16:03:31 2010 +0000

    Merge branch 'clientapi-2'

 docs/reference/libtracker-client/Makefile.am       |    2 +-
 .../libtracker-client-sections.txt                 |   39 +-
 .../libtracker-client/libtracker-client.types      |    1 +
 src/libtracker-client/tracker.c                    | 1196 +++++++++++++-------
 src/libtracker-client/tracker.h                    |  151 ++-
 src/libtracker-gtk/tracker-keyword-store.c         |    4 +-
 src/libtracker-gtk/tracker-metadata-tile.c         |    5 +-
 src/libtracker-gtk/tracker-tag-bar.c               |    5 +-
 src/libtracker-miner/tracker-miner.c               |   77 +-
 ...-freedesktop-Tracker-evolution-plugin.eplug.xml |    4 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |  858 +++++++--------
 src/plugins/nautilus/tracker-tags-extension.c      |    4 +-
 src/plugins/nautilus/tracker-tags-view.c           |    4 +-
 src/tracker-miner-fs/tracker-miner-files.c         |    2 +-
 src/tracker-search-bar/tracker-results-window.c    |    4 +-
 src/tracker-utils/tracker-import.c                 |    4 +-
 src/tracker-utils/tracker-info.c                   |    4 +-
 src/tracker-utils/tracker-search.c                 |   22 +-
 src/tracker-utils/tracker-sparql.c                 |   18 +-
 src/tracker-utils/tracker-stats.c                  |    4 +-
 src/tracker-utils/tracker-status.c                 |    8 +-
 src/tracker-utils/tracker-tag.c                    |   12 +-
 src/tracker-writeback/tracker-writeback-consumer.c |    4 +-
 23 files changed, 1444 insertions(+), 988 deletions(-)
---