[tracker/harmattan: 2031/2240] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit abeea2799232330a4f3069e9e1d3eadf0d3119f3
Merge: 3f04d23 b143827
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jan 14 16:49:05 2010 +0000

    Merge branch 'master' into harmattan

 NEWS                                               |   79 +
 configure.ac                                       |    2 +-
 data/dbus/tracker-backup.xml                       |    2 -
 data/dbus/tracker-resources.xml                    |    5 +
 data/ontologies/31-nao.ontology                    |    3 +-
 data/ontologies/32-nco.ontology                    |    1 +
 data/ontologies/34-nmo.ontology                    |    7 +-
 data/ontologies/40-mlo.ontology                    |   26 +-
 docs/reference/libtracker-client/Makefile.am       |    2 +-
 .../libtracker-client-sections.txt                 |   39 +-
 .../libtracker-client/libtracker-client.types      |    1 +
 po/sl.po                                           | 1792 ++++++++-------
 po/sv.po                                           | 2488 +++++++++++---------
 src/libtracker-client/tracker.c                    | 1196 +++++++----
 src/libtracker-client/tracker.h                    |  151 +-
 src/libtracker-common/Makefile.am                  |    4 +-
 src/libtracker-common/tracker-class.c              |   50 +-
 src/libtracker-common/tracker-class.h              |    4 +
 src/libtracker-common/tracker-crc32.c              |   95 +
 src/libtracker-common/tracker-crc32.h              |   49 +
 src/libtracker-common/tracker-dbus.c               |  358 +++-
 src/libtracker-common/tracker-dbus.h               |   10 +-
 src/libtracker-common/tracker-property.c           |   45 +-
 src/libtracker-common/tracker-property.h           |    3 +
 src/libtracker-data/tracker-data-backup.c          |  190 +--
 src/libtracker-data/tracker-data-backup.h          |    7 +-
 src/libtracker-data/tracker-data-manager.c         |  659 ++++--
 src/libtracker-data/tracker-data-manager.h         |    3 +-
 src/libtracker-data/tracker-data-query.c           |    8 +-
 src/libtracker-data/tracker-data-query.h           |    4 +-
 src/libtracker-data/tracker-data-update.c          |  256 ++-
 src/libtracker-data/tracker-data-update.h          |    3 +
 src/libtracker-db/Makefile.am                      |    2 -
 src/libtracker-db/tracker-db-backup.c              |  339 ---
 src/libtracker-db/tracker-db-backup.h              |   54 -
 src/libtracker-db/tracker-db-interface-sqlite.c    |   27 -
 src/libtracker-db/tracker-db-interface.c           |   16 -
 src/libtracker-db/tracker-db-interface.h           |    5 +-
 src/libtracker-db/tracker-db-journal.c             |  981 +++++++-
 src/libtracker-db/tracker-db-journal.h             |   84 +-
 src/libtracker-db/tracker-db-manager.c             |  457 +++--
 src/libtracker-db/tracker-db-manager.h             |   28 +-
 src/libtracker-db/tracker-db.h                     |    1 -
 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               |  115 +-
 ...-freedesktop-Tracker-evolution-plugin.eplug.xml |    4 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |  824 ++++----
 src/plugins/kmail/tracker-kmail-registrar.c        |   48 +-
 src/plugins/nautilus/tracker-tags-extension.c      |    4 +-
 src/plugins/nautilus/tracker-tags-view.c           |    4 +-
 src/tracker-control/tracker-control.c              |    6 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |   45 +-
 src/tracker-extract/tracker-extract.c              |   59 +-
 src/tracker-miner-fs/tracker-miner-files.c         |    2 +-
 src/tracker-search-bar/tracker-results-window.c    |    4 +-
 src/tracker-store/tracker-backup.c                 |   82 +-
 src/tracker-store/tracker-backup.h                 |    2 -
 src/tracker-store/tracker-dbus.h                   |    3 -
 src/tracker-store/tracker-main.c                   |   30 +-
 src/tracker-store/tracker-resources.c              |   85 +-
 src/tracker-store/tracker-resources.h              |    3 +
 src/tracker-store/tracker-statistics.c             |    4 +-
 src/tracker-store/tracker-store.c                  |  119 +-
 src/tracker-store/tracker-store.h                  |    4 +-
 src/tracker-utils/tracker-import.c                 |    4 +-
 src/tracker-utils/tracker-info.c                   |    4 +-
 src/tracker-utils/tracker-search.c                 |   33 +-
 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 +-
 tests/libtracker-common/tracker-dbus-test.c        |    8 +-
 tests/libtracker-data/tracker-ontology-test.c      |    2 +-
 tests/libtracker-data/tracker-sparql-blank-test.c  |    2 +-
 tests/libtracker-data/tracker-sparql-test.c        |    2 +-
 tests/libtracker-db/.gitignore                     |    2 +
 tests/libtracker-db/Makefile.am                    |   24 +-
 tests/libtracker-db/tracker-db-journal.c           |  359 +++
 tests/libtracker-fts/tracker-fts-test.c            |    2 +-
 82 files changed, 7050 insertions(+), 4435 deletions(-)
---