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

[Martyn James Russell <mr src gnome org>]

commit c47aabc7f9e7e741c9816e73385e6a7ee276aff0
Merge: 80486a7 3128cff
Author: Jürg Billeter <j bitron ch>
Date:   Mon Jul 20 16:42:19 2009 +0200

    Merge branch 'master' into harmattan

 configure.ac                                       |    2 +-
 .../libtracker-common/libtracker-common-docs.sgml  |    2 -
 .../libtracker-common-sections.txt                 |   73 -
 .../libtracker-common/libtracker-common.types      |    9 -
 po/de.po                                           |  654 +++---
 po/es.po                                           |  140 +-
 src/Makefile.am                                    |    2 +-
 src/libtracker-common/Makefile.am                  |   10 +-
 src/libtracker-common/tracker-common.h             |    1 -
 src/libtracker-common/tracker-config-manager.c     |  371 +++
 src/libtracker-common/tracker-config-manager.h     |  118 +
 src/libtracker-common/tracker-config-utils.c       |  351 +++
 src/libtracker-common/tracker-config-utils.h       |   81 +
 src/libtracker-common/tracker-config.c             | 2377 --------------------
 src/libtracker-common/tracker-language.c           |  145 +-
 src/libtracker-common/tracker-language.h           |   35 +-
 src/libtracker-common/tracker-log.c                |   20 +-
 src/libtracker-common/tracker-log.h                |    4 +-
 src/libtracker-common/tracker-statement-list.c     |   34 +-
 src/libtracker-common/tracker-thumbnailer.c        |   42 +-
 src/libtracker-common/tracker-thumbnailer.h        |    4 +-
 src/libtracker-common/tracker-utils.c              |   20 -
 src/libtracker-common/tracker-utils.h              |   39 +-
 src/libtracker-data/tracker-data-manager.c         |   87 +-
 src/libtracker-data/tracker-data-manager.h         |    7 +-
 src/libtracker-data/tracker-data-query.h           |    1 -
 src/libtracker-data/tracker-data-update.c          |    4 +-
 src/libtracker-data/tracker-turtle.c               |   99 +-
 src/libtracker-data/tracker-turtle.h               |    2 +
 src/libtracker-db/tracker-db-manager.h             |    6 -
 src/rasqal/sparql_parser.y                         |    2 +-
 src/tracker-applet/tracker-applet.c                |    4 +
 src/tracker-extract/Makefile.am                    |    3 +-
 src/tracker-extract/tracker-config.c               |  320 +++
 src/tracker-extract/tracker-config.h               |   60 +
 src/tracker-extract/tracker-main.c                 |   18 +-
 src/tracker-fts/Makefile.am                        |    4 +
 src/tracker-fts/tracker-fts-config.c               |  430 ++++
 src/tracker-fts/tracker-fts-config.h               |   65 +
 src/tracker-fts/tracker-fts.c                      |   14 +-
 src/tracker-miner-fs/Makefile.am                   |    8 +-
 src/tracker-miner-fs/modules/evolution-imap.c      |   32 +-
 src/tracker-miner-fs/modules/evolution-pop.c       |   17 +-
 src/tracker-miner-fs/tracker-config.c              | 1063 +++++++++
 .../tracker-config.h                               |   59 +-
 src/tracker-miner-fs/tracker-crawler.c             |    4 +-
 src/tracker-miner-fs/tracker-crawler.h             |    2 +-
 src/tracker-miner-fs/tracker-indexer.c             |    5 +-
 src/tracker-miner-fs/tracker-main.c                |   23 +-
 .../tracker-module-metadata-utils.c                |    2 +-
 src/tracker-miner-fs/tracker-monitor.c             |    2 +-
 src/tracker-miner-fs/tracker-monitor.h             |    2 +-
 src/tracker-miner-fs/tracker-processor.c           |    4 +-
 src/tracker-miner-fs/tracker-processor.h           |    2 +-
 .../tracker-status.c                               |    0
 .../tracker-status.h                               |    3 +-
 src/tracker-miner-fs/tracker-utils.c               |   43 +
 src/tracker-miner-fs/tracker-utils.h               |   31 +
 src/tracker-store/Makefile.am                      |    4 +-
 src/tracker-store/tracker-backup.c                 |    8 +-
 src/tracker-store/tracker-config.c                 |  397 ++++
 src/tracker-store/tracker-config.h                 |   63 +
 src/tracker-store/tracker-dbus.c                   |   16 +-
 src/tracker-store/tracker-dbus.h                   |   11 +-
 src/tracker-store/tracker-main.c                   |  311 +---
 src/tracker-store/tracker-push.c                   |    9 +-
 src/tracker-store/tracker-push.h                   |    4 +-
 src/tracker-store/tracker-resource-class.c         |    1 -
 src/tracker-store/tracker-statistics.c             |    4 -
 src/tracker-store/tracker-statistics.h             |    2 -
 src/tracker-store/tracker-store.c                  |   38 +-
 tests/libtracker-common/tracker-thumbnailer-test.c |   27 +-
 tests/libtracker-data/tracker-ontology-test.c      |   11 +-
 tests/libtracker-data/tracker-sparql-test.c        |   14 +-
 tests/tracker-miner-fs/Makefile.am                 |    5 +-
 75 files changed, 4261 insertions(+), 3626 deletions(-)
---