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

[Martyn James Russell <mr src gnome org>]

commit f9e4970ec39f7982ed7e598fb04f21fe2556d00a
Merge: 1b57567 2b0a5aa
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jun 24 17:35:14 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |   40 +
 configure.ac                                       |   60 +-
 examples/Makefile.am                               |    3 +-
 examples/tracker-steroids/.gitignore               |    5 +
 examples/tracker-steroids/Makefile.am              |   50 +
 examples/tracker-steroids/benchmark-tracker-ipc.c  |   91 ++
 examples/tracker-steroids/benchmark-update.c       |   92 ++
 examples/tracker-steroids/benchmark.c              |   91 ++
 examples/tracker-steroids/steroids-sparql-async.c  |   80 ++
 .../steroids-sparql-update-async.c                 |   98 ++
 examples/tracker-steroids/steroids-sparql.c        |   68 +
 src/Makefile.am                                    |   13 +-
 src/libtracker-client/Makefile.am                  |    2 +
 src/libtracker-client/tracker.c                    | 1425 ++++++++++++++++++--
 src/libtracker-client/tracker.h                    |   30 +
 src/libtracker-common/Makefile.am                  |   15 +-
 src/libtracker-data/tracker-data-manager.c         |   24 +-
 src/libtracker-data/tracker-data-update.c          |  115 +-
 src/libtracker-data/tracker-sparql-pattern.vala    |    1 +
 src/libtracker-db/Makefile.am                      |    8 +-
 src/libtracker-db/tracker-db-interface-sqlite.c    |   12 +-
 src/libtracker-db/tracker-db-manager.c             |   25 +-
 src/libtracker-miner/tracker-miner-fs.c            |  158 ++-
 src/libtracker-miner/tracker-miner-object.c        |   26 +-
 src/libtracker-miner/tracker-miner-object.h        |    3 +-
 src/miners/flickr/Makefile.am                      |    2 +-
 src/miners/fs/tracker-config.c                     |  116 +-
 src/miners/fs/tracker-miner-files-reindex.c        |   32 +-
 src/miners/fs/tracker-miner-files.c                |  190 +++-
 src/miners/fs/tracker-volume-cleanup.c             |  170 ---
 src/miners/fs/tracker-volume-cleanup.h             |   30 -
 src/tracker-extract/tracker-extract-mp3.c          |    2 +-
 src/tracker-search-tool/Makefile.am                |    2 +-
 src/tracker-search-tool/tracker-category-view.gs   |    4 +
 src/tracker-search-tool/tracker-entry.gs           |   38 +-
 src/tracker-search-tool/tracker-metadata-tile.gs   |   66 +-
 src/tracker-search-tool/tracker-result-grid.gs     |   63 +-
 src/tracker-search-tool/tracker-utils.gs           |   21 +
 src/tracker-store/Makefile.am                      |    7 +-
 src/tracker-store/tracker-dbus.c                   |   19 +
 src/tracker-store/tracker-steroids.c               |  671 +++++++++
 src/tracker-store/tracker-steroids.h               |   57 +
 src/tracker-utils/tracker-search.c                 |   20 +-
 tests/Makefile.am                                  |    8 +-
 tests/libtracker-data/optional/Makefile.am         |    7 +-
 .../optional/simple-optional-triple.ontology       |   22 +
 .../optional/simple-optional-triple.out            |    1 +
 .../optional/simple-optional-triple.rq             |    7 +
 .../optional/simple-optional-triple.ttl            |    5 +
 tests/libtracker-data/sort/Makefile.am             |    4 +-
 tests/libtracker-data/sort/query-sort-6.out        |    5 +
 tests/libtracker-data/sort/query-sort-6.rq         |    6 +
 tests/libtracker-data/tracker-sparql-test.c        |    2 +
 tests/libtracker-db/Makefile.am                    |    3 +-
 tests/tracker-steroids/.gitignore                  |    1 +
 tests/tracker-steroids/Makefile.am                 |   31 +
 tests/tracker-steroids/tracker-test.c              |  655 +++++++++
 57 files changed, 4227 insertions(+), 575 deletions(-)
---