[tracker/search-bar: 41/41] Merge branch 'master' into search-bar

[Carlos Garnacho <carlosg src gnome org>]

commit 91c3374cd034753504822383fe8c4d7151943309
Merge: 81a14bd... 4356e69...
Author: Carlos Garnacho <carlos lanedo com>
Date:   Thu Sep 24 17:40:04 2009 +0200

    Merge branch 'master' into search-bar

 data/miners/Makefile.am                            |    2 +-
 data/ontologies/30-nie.ontology                    |    1 -
 docs/manpages/tracker-extract.1                    |    3 +-
 docs/manpages/tracker-miner-fs.1                   |    3 +-
 docs/manpages/tracker-search.1                     |   35 +-
 docs/manpages/tracker-sparql.1                     |    2 +-
 docs/manpages/tracker-store.1                      |    4 +-
 po/POTFILES.in                                     |    3 +-
 src/libtracker-client/tracker.c                    |  267 ++++
 src/libtracker-client/tracker.h                    |   23 +
 src/libtracker-common/tracker-sparql-builder.vala  |    6 +
 src/plugins/evolution/Makefile.am                  |   52 +-
 .../org.freedesktop.Tracker1.Miner.EMails.service  |    2 +
 src/plugins/evolution/tracker-evolution-common.h   |   79 -
 src/plugins/evolution/tracker-evolution-plugin.c   | 1641 ++++++++++++--------
 src/plugins/evolution/tracker-evolution-plugin.h   |   11 +-
 src/plugins/evolution/tracker-evolution-plugin.xml |   11 -
 .../evolution/tracker-evolution-registrar.c        |  902 -----------
 .../evolution/tracker-evolution-registrar.h        |   94 --
 .../evolution/tracker-evolution-registrar.xml      |   39 -
 .../evolution/tracker-miner-emails.desktop.in      |    6 +
 src/tracker-utils/tracker-search.c                 |  552 +++++--
 src/tracker-utils/tracker-status.c                 |    2 +-
 23 files changed, 1716 insertions(+), 2024 deletions(-)
---