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

[Martyn James Russell <mr src gnome org>]

commit cf1749140c44fc0a6fb126b0542b801736ca2800
Merge: ed5fcbc a0559c2
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Jul 23 11:00:08 2010 +0100

    Merge branch 'master' into harmattan

 Makefile.am                                        |   12 +-
 NEWS                                               |   52 +
 configure.ac                                       |    4 +-
 data/db/Makefile.am                                |    1 -
 data/db/sqlite-contents.sql                        |    8 -
 data/db/sqlite-tracker.sql                         |    1 -
 data/ontologies/31-nao.ontology                    |    4 +-
 data/ontologies/91-maemo.ontology                  |   55 +-
 po/es.po                                           |  195 ++-
 po/sl.po                                           |  155 +-
 po/zh_CN.po                                        | 1796 +++++++++++---------
 src/Makefile.am                                    |    1 -
 src/libtracker-client/tracker.c                    |   20 +-
 src/libtracker-common/tracker-dbus.c               |   25 +-
 src/libtracker-common/tracker-file-utils.c         |    4 +-
 src/libtracker-data/Makefile.am                    |   23 +-
 src/libtracker-data/libtracker-data.vapi           |   48 +-
 src/libtracker-data/tracker-data-backup.c          |   23 +-
 src/libtracker-data/tracker-data-manager.c         |   48 +-
 src/libtracker-data/tracker-data-manager.h         |    8 +-
 src/libtracker-data/tracker-data-query.c           |   11 +-
 src/libtracker-data/tracker-data-query.h           |    2 +-
 src/libtracker-data/tracker-data-update.c          |   11 +-
 src/libtracker-data/tracker-data-update.h          |    2 +-
 src/libtracker-data/tracker-data.h                 |    6 +
 .../tracker-db-config.c                            |    0
 .../tracker-db-config.h                            |    0
 .../tracker-db-dbus.c                              |    0
 .../tracker-db-dbus.h                              |    4 +-
 .../tracker-db-interface-sqlite.c                  |   70 +-
 .../tracker-db-interface-sqlite.h                  |    4 +-
 .../tracker-db-interface.c                         |    0
 .../tracker-db-interface.h                         |    8 +-
 .../tracker-db-journal.c                           |   12 +-
 .../tracker-db-journal.h                           |    0
 .../tracker-db-manager.c                           |  196 +--
 .../tracker-db-manager.h                           |    8 +-
 src/libtracker-data/tracker-sparql-expression.vala |   12 +
 src/libtracker-data/tracker-sparql-pattern.vala    |   47 +-
 src/libtracker-data/tracker-sparql-scanner.vala    |   12 +
 src/libtracker-db/COPYING.LIB                      |  510 ------
 src/libtracker-db/Makefile.am                      |   48 -
 src/libtracker-db/libtracker-db.vapi               |   67 -
 src/libtracker-db/tracker-db.h                     |   42 -
 src/libtracker-fts/tracker-fts.c                   |    2 +-
 src/libtracker-miner/tracker-dbus.c                |   12 +-
 src/libtracker-miner/tracker-miner-fs.c            |    6 +-
 src/libtracker-miner/tracker-monitor.c             |   36 +-
 src/libtracker-miner/tracker-storage.c             |    1 +
 src/miners/fs/Makefile.am                          |    2 +-
 src/miners/fs/tracker-main.c                       |    4 +-
 src/miners/fs/tracker-miner-applications.c         |   12 +-
 src/miners/fs/tracker-miner-files.c                |    7 +-
 src/plugins/kmail/Makefile.am                      |    2 +-
 src/tracker-control/Makefile.am                    |    2 +-
 src/tracker-control/tracker-control.c              |    2 +-
 src/tracker-extract/tracker-albumart-pixbuf.c      |    8 +
 src/tracker-extract/tracker-extract-msoffice.c     |   15 +-
 src/tracker-extract/tracker-extract-oasis.c        |   12 +-
 src/tracker-extract/tracker-extract.c              |    8 +-
 src/tracker-store/Makefile.am                      |    1 -
 src/tracker-store/tracker-dbus.c                   |   12 +-
 src/tracker-store/tracker-main.c                   |    8 +-
 src/tracker-store/tracker-resource-class.c         |    3 +-
 src/tracker-store/tracker-resources.c              |    7 +-
 src/tracker-store/tracker-statistics.c             |    5 +-
 src/tracker-store/tracker-steroids.c               |   13 +-
 src/tracker-store/tracker-store.c                  |   41 +-
 src/tracker-store/tracker-store.h                  |    3 +-
 src/tracker-utils/Makefile.am                      |    1 -
 src/tracker-writeback/tracker-writeback-playlist.c |    1 +
 tests/Makefile.am                                  |    1 -
 tests/libtracker-data/.gitignore                   |    5 +
 tests/libtracker-data/Makefile.am                  |   98 ++-
 .../example.index                                  |  Bin 1319 -> 1319 bytes
 .../run-test-in-tmp-dir.sh                         |    0
 tests/libtracker-data/tracker-backup-test.c        |    4 +-
 .../tracker-db-dbus-test.c                         |    2 +-
 .../tracker-db-journal.c                           |    2 +-
 .../tracker-db-manager-common.c                    |    0
 .../tracker-db-manager-common.h                    |    2 +-
 .../tracker-db-manager-test-attach.c               |    2 +-
 .../tracker-db-manager-test-custom.c               |    2 +-
 .../tracker-db-manager-test-unattach.c             |    2 +-
 .../libtracker-data/tracker-ontology-change-test.c |    7 +-
 tests/libtracker-data/tracker-ontology-test.c      |    3 +-
 tests/libtracker-data/tracker-sparql-blank-test.c  |    3 +-
 tests/libtracker-data/tracker-sparql-test.c        |    2 +-
 tests/libtracker-db/.gitignore                     |    4 -
 tests/libtracker-db/Makefile.am                    |  113 --
 tests/libtracker-fts/Makefile.am                   |    1 -
 tests/libtracker-fts/tracker-fts-test.c            |    3 +-
 tests/tracker-miner-fs/Makefile.am                 |    1 -
 93 files changed, 1902 insertions(+), 2136 deletions(-)
---