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

[Martyn James Russell <mr src gnome org>]

commit 4ede176843e023d5b4d155bb62285026cf079278
Merge: 3dca5b9 03818d0
Author: Jürg Billeter <j bitron ch>
Date:   Fri Aug 7 17:08:36 2009 +0200

    Merge branch 'master' into harmattan

 configure.ac                                       |   25 +-
 data/dbus/tracker-extract.xml                      |    5 +
 data/ontologies/34-nmo.ontology                    |   18 -
 data/ontologies/39-mto.ontology                    |   12 +
 data/ontologies/41-mfo.ontology                    |  186 ++++
 data/ontologies/90-tracker.ontology                |    7 +-
 docs/manpages/tracker-store.1                      |   21 +
 po/POTFILES.in                                     |    1 +
 po/de.po                                           |   53 +-
 po/es.po                                           |   97 +-
 python/gtk-sparql/Completion.py                    |  285 ++++++
 python/gtk-sparql/gtk-sparql.py                    |  213 ++++
 python/gtk-sparql/gtk-sparql.ui                    |  201 ++++
 python/gtk-sparql/store.py                         |   68 ++
 python/gtk-sparql/tracker_completion.py            |  123 +++
 src/libstemmer/header.h                            |    4 +-
 src/libtracker-common/Makefile.am                  |   28 +-
 src/libtracker-common/tracker-albumart.c           |  759 --------------
 src/libtracker-common/tracker-albumart.h           |   59 --
 ...cker-config-manager.c => tracker-config-file.c} |  122 ++--
 src/libtracker-common/tracker-config-file.h        |   61 ++
 src/libtracker-common/tracker-config-manager.h     |  118 ---
 src/libtracker-common/tracker-config-utils.h       |   81 --
 ...ker-config-utils.c => tracker-keyfile-object.c} |  178 ++--
 src/libtracker-common/tracker-keyfile-object.h     |   81 ++
 src/libtracker-common/tracker-marshal-main.c       |    2 -
 src/libtracker-common/tracker-ontology.h           |    2 +-
 src/libtracker-common/tracker-os-dependant-unix.c  |    6 +-
 src/libtracker-common/tracker-statement-list.c     |    4 +-
 src/libtracker-data/tracker-data-manager.c         |   28 +-
 src/libtracker-data/tracker-data-update.c          |  139 +++-
 src/libtracker-data/tracker-sparql-query.vala      |  123 ++-
 src/libtracker-db/Makefile.am                      |    4 +-
 src/libtracker-db/tracker-db-interface-sqlite.c    |   15 +-
 src/libtracker-db/tracker-db-manager.c             |   35 +-
 src/libtracker-db/tracker-db-manager.h             |    3 +-
 .../evolution/tracker-evolution-registrar.c        |    6 +-
 src/plugins/kmail/tracker-kmail-registrar.c        |    6 +-
 src/tracker-extract/Makefile.am                    |   65 +-
 src/tracker-extract/tracker-albumart.c             | 1080 ++++++++++++++++++++
 ...acker-extract-albumart.h => tracker-albumart.h} |   26 +-
 src/tracker-extract/tracker-config.c               |   54 +-
 src/tracker-extract/tracker-config.h               |    6 +-
 src/tracker-extract/tracker-extract-albumart.c     |  250 -----
 src/tracker-extract/tracker-extract-gstreamer.c    |   19 +-
 src/tracker-extract/tracker-extract-mp3.c          |  333 +++++--
 src/tracker-extract/tracker-extract-tiff.c         |   18 +-
 src/tracker-extract/tracker-extract.c              |   22 +-
 src/tracker-extract/tracker-extract.h              |    2 +-
 src/tracker-extract/tracker-main.c                 |   64 +-
 src/tracker-extract/tracker-main.h                 |    6 -
 src/tracker-extract/tracker-marshal.list           |    1 +
 src/tracker-extract/tracker-topanalyzer.h          |    2 +-
 src/tracker-fts/tracker-fts-config.c               |   58 +-
 src/tracker-fts/tracker-fts-config.h               |    6 +-
 src/tracker-fts/tracker-fts.c                      |   12 +-
 src/tracker-miner-fs/Makefile.am                   |   42 +-
 src/tracker-miner-fs/modules/applications.c        |    3 +
 src/tracker-miner-fs/modules/evolution-imap.c      |    7 +
 src/tracker-miner-fs/modules/evolution-pop.c       |    7 +
 src/tracker-miner-fs/tracker-config.c              |  112 +-
 src/tracker-miner-fs/tracker-config.h              |    8 +-
 src/tracker-miner-fs/tracker-crawler.c             |    3 +-
 src/tracker-miner-fs/tracker-indexer.c             |  562 ++++++++---
 src/tracker-miner-fs/tracker-indexer.h             |    8 +-
 src/tracker-miner-fs/tracker-main.c                |  143 +++-
 src/tracker-miner-fs/tracker-marshal-main.c        |    2 -
 src/tracker-miner-fs/tracker-marshal.list          |    1 +
 .../tracker-module-metadata-utils.c                |    2 +-
 .../tracker-thumbnailer.c                          |   55 +-
 .../tracker-thumbnailer.h                          |   17 +-
 .../tracker-volume-cleanup.c                       |    4 +-
 .../tracker-volume-cleanup.h                       |    0
 src/tracker-store/Makefile.am                      |   26 +-
 src/tracker-store/tracker-config.c                 |   52 +-
 src/tracker-store/tracker-config.h                 |    6 +-
 src/tracker-store/tracker-main.c                   |    7 -
 src/tracker-store/tracker-marshal-main.c           |    2 -
 src/tracker-utils/tracker-import.c                 |    2 +-
 src/tracker-utils/tracker-sparql.c                 |    2 +-
 tests/Makefile.am                                  |    3 +-
 tests/libtracker-common/Makefile.am                |   28 +-
 tests/libtracker-common/tracker-albumart-test.c    |  256 -----
 tests/libtracker-common/tracker-thumbnailer-test.c |  183 ----
 tests/libtracker-data/Makefile.am                  |   14 +-
 tests/libtracker-data/algebra/Makefile.am          |    8 +
 .../libtracker-data/bnode-coreference/Makefile.am  |    7 +
 tests/libtracker-data/bound/Makefile.am            |    7 +
 tests/libtracker-data/expr-ops/Makefile.am         |   19 +
 tests/libtracker-data/nie/Makefile.am              |   30 +
 tests/libtracker-data/nmo/Makefile.am              |   36 +
 tests/libtracker-data/regex/Makefile.am            |    9 +
 tests/libtracker-data/sort/Makefile.am             |   19 +
 tests/libtracker-data/tracker-ontology-test.c      |   56 +-
 tests/libtracker-data/tracker-sparql-test.c        |   59 +-
 tests/tracker-miner-fs/Makefile.am                 |   20 +-
 tests/tracker-store/Makefile.am                    |   36 +
 .../tracker-events-test.c                          |    0
 utils/Makefile.am                                  |    1 -
 utils/albumart/.gitignore                          |    1 -
 utils/albumart/Makefile.am                         |   18 -
 utils/albumart/albumart-strip.c                    |   91 --
 102 files changed, 4364 insertions(+), 2813 deletions(-)
---