[tracker/harmattan-pre-signal-updates: 1211/1380] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 8cd535e9b8d28572e2e5b3504a7b72ec6ca28862
Merge: ae0d6e2 bb11151
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Aug 26 17:25:56 2010 +0100

    Merge branch 'master' into harmattan

 Makefile.am                                        |    8 +
 NEWS                                               |   59 ++
 configure.ac                                       |   18 +-
 data/dbus/Makefile.am                              |    2 +-
 data/dbus/tracker-miner-files-index.xml            |   14 +
 data/dbus/tracker-miner-files-reindex.xml          |   10 -
 data/dbus/tracker-status.xml                       |    3 +
 data/ontologies/92-slo.ontology                    |   10 +-
 docs/manpages/tracker-control.1                    |    7 +-
 docs/manpages/tracker-miner-fs.1                   |    6 -
 po/cs.po                                           |  590 ++++++++-------
 po/de.po                                           |  647 +++++++++-------
 po/es.po                                           |  231 +++---
 po/fr.po                                           |  806 +++++++++++---------
 po/sl.po                                           |  592 ++++++++-------
 src/libtracker-bus/Makefile.am                     |    1 +
 src/libtracker-bus/tracker-bus-fd-update.c         |   76 ++-
 src/libtracker-bus/tracker-bus-fd-update.h         |   10 +
 src/libtracker-bus/tracker-bus-fd-update.vapi      |    4 +
 src/libtracker-bus/tracker-bus.vala                |   74 ++-
 src/libtracker-client/Makefile.am                  |    4 +-
 src/libtracker-data/tracker-data-manager.c         |    4 +
 src/libtracker-data/tracker-data-update.c          |    4 +
 src/libtracker-data/tracker-db-journal.c           |   13 +-
 src/libtracker-direct/Makefile.am                  |    4 +-
 src/libtracker-direct/tracker-direct.vala          |   16 +
 src/libtracker-miner/Makefile.am                   |    1 +
 src/libtracker-miner/tracker-miner-fs.c            |  143 ++++-
 src/libtracker-miner/tracker-miner-fs.h            |    8 +-
 src/libtracker-miner/tracker-miner-manager.c       |  106 +++
 src/libtracker-miner/tracker-miner-manager.h       |   16 +
 src/libtracker-sparql/.gitignore                   |    1 +
 src/libtracker-sparql/Makefile.am                  |   12 +-
 src/libtracker-sparql/tracker-connection.vala      |   24 +-
 src/libtracker-sparql/tracker-cursor.vala          |    3 +
 src/libtracker-sparql/tracker-plugin-loader.vala   |  112 +++-
 src/libtracker-sparql/tracker-sparql.deps          |    1 +
 src/libtracker-sparql/tracker-utils.vala           |  115 ++--
 src/miners/fs/Makefile.am                          |    6 +-
 src/miners/fs/tracker-dbus.c                       |   14 +-
 src/miners/fs/tracker-main.c                       |   56 +-
 src/miners/fs/tracker-miner-files-index.c          |  438 +++++++++++
 src/miners/fs/tracker-miner-files-index.h          |   65 ++
 src/miners/fs/tracker-miner-files-reindex.c        |  279 -------
 src/miners/fs/tracker-miner-files-reindex.h        |   60 --
 src/plugins/evolution/tracker-evolution-plugin.c   |    2 +
 src/tracker-control/Makefile.am                    |    2 +-
 src/tracker-control/tracker-control.c              |   82 ++-
 src/tracker-extract/tracker-extract-gstreamer.c    |    6 +-
 src/tracker-store/tracker-dbus.c                   |   52 +-
 src/tracker-store/tracker-status.c                 |   71 +-
 src/tracker-store/tracker-status.h                 |    3 +
 src/tracker-utils/tracker-info.c                   |   19 +-
 src/tracker-utils/tracker-sparql.c                 |   18 +-
 src/tracker-utils/tracker-tag.c                    |   72 ++-
 tests/Makefile.am                                  |    1 +
 tests/functional-tests/03-fts-functions.py         |   27 +-
 tests/functional-tests/create-tests-xml.py         |    2 +-
 .../images/corrupted-image.expected                |    1 -
 tests/libtracker-sparql/.gitignore                 |    1 +
 tests/libtracker-sparql/Makefile.am                |   29 +
 tests/libtracker-sparql/tracker-test.c             |   67 ++
 62 files changed, 3180 insertions(+), 1948 deletions(-)
---