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

[Martyn James Russell <mr src gnome org>]

commit 6faef7a989ddbeb69e9b0f232f08e2bcc7a7a2ba
Merge: 1060871 1583090
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Nov 27 13:00:54 2009 +0000

    Merge branch 'master' into harmattan

 Makefile.am                                        |    4 +-
 NEWS                                               |   77 +++
 configure.ac                                       |   65 +++-
 data/dbus/Makefile.am                              |    3 +-
 data/dbus/tracker-miner.xml                        |    5 +
 data/dbus/tracker-resources.xml                    |   12 +
 data/dbus/tracker-writeback.xml                    |    8 +
 data/ontologies/30-nie.ontology                    |   12 +-
 data/ontologies/31-nao.description                 |   21 +-
 data/ontologies/32-nco.description                 |   18 +-
 data/ontologies/32-nco.ontology                    |    3 +-
 data/ontologies/33-nfo.description                 |   20 +-
 data/ontologies/33-nfo.ontology                    |    3 +-
 data/ontologies/35-ncal.description                |   18 +-
 data/ontologies/38-nmm.description                 |    7 +-
 data/ontologies/38-nmm.ontology                    |   37 +-
 data/ontologies/39-mto.description                 |    6 +-
 data/ontologies/40-mlo.description                 |    3 +-
 data/ontologies/41-mfo.description                 |    8 +-
 data/ontologies/41-mfo.ontology                    |    7 +
 data/ontologies/90-tracker.ontology                |    9 +-
 docs/ontologies/explanation.html.template          |   11 +-
 docs/ontologies/index.html                         |   57 ++
 docs/ontologies/mfo/explanation.html               |   17 +
 docs/ontologies/mfo/feeds-overview.dia             |  Bin 0 -> 5068 bytes
 docs/ontologies/nie/explanation.html               |   67 ++-
 docs/ontologies/nmm/explanation.html               |   38 ++
 docs/ontologies/nmm/images-overview.dia            |  Bin 0 -> 5152 bytes
 docs/ontologies/nmm/radio-overview.dia             |  Bin 0 -> 3564 bytes
 docs/ontologies/notation.dia                       |  Bin 0 -> 2140 bytes
 docs/ontologies/xsd/explanation.html               |   10 +
 docs/reference/libtracker-miner/Makefile.am        |    1 +
 .../libtracker-miner/tmpl/tracker-miner-fs.sgml    |   12 +
 .../libtracker-miner/tmpl/tracker-miner.sgml       |    9 +
 examples/Makefile.am                               |    4 +
 .../test => examples/libtracker-miner}/.gitignore  |    0
 .../test => examples/libtracker-miner}/Makefile.am |    1 +
 .../libtracker-miner}/tracker-main.c               |   24 +-
 .../libtracker-miner}/tracker-miner-test.c         |    0
 .../libtracker-miner}/tracker-miner-test.h         |    0
 po/POTFILES.in                                     |    1 +
 po/es.po                                           |  561 ++++++++++----------
 python/rss_reader/signaler.py                      |    2 +-
 src/Makefile.am                                    |    3 +-
 src/libtracker-client/tracker.c                    |   43 ++
 src/libtracker-client/tracker.h                    |    7 +
 src/libtracker-common/tracker-dbus.h               |    2 +
 src/libtracker-common/tracker-file-utils.c         |  141 +++++
 src/libtracker-common/tracker-file-utils.h         |    4 +
 src/libtracker-common/tracker-sparql-builder.vala  |    7 +-
 src/libtracker-common/tracker-storage-hal.c        |   21 +-
 src/libtracker-data/tracker-data-update.c          |  139 ++++-
 src/libtracker-data/tracker-data-update.h          |    3 +
 src/libtracker-data/tracker-sparql-query.vala      |  168 ++++--
 src/libtracker-data/tracker-sparql-scanner.vala    |    2 +-
 src/libtracker-fts/tracker-parser.c                |    4 +-
 src/libtracker-miner/Makefile.am                   |    2 -
 src/libtracker-miner/tracker-miner-dbus.h          |    4 +
 src/libtracker-miner/tracker-miner-fs.c            |  323 +++++++++--
 src/libtracker-miner/tracker-miner-fs.h            |    5 +
 src/libtracker-miner/tracker-miner-manager.c       |   52 ++
 src/libtracker-miner/tracker-miner-manager.h       |    4 +
 src/libtracker-miner/tracker-miner.c               |  310 +++++++++---
 src/libtracker-miner/tracker-miner.h               |   99 ++--
 src/libtracker-miner/tracker-monitor.c             |  152 ++++--
 src/plugins/evolution/tracker-evolution-plugin.c   |   31 +-
 src/plugins/kmail/tracker-kmail-registrar.c        |    9 +-
 src/tracker-control/tracker-control.c              |    2 +-
 src/tracker-extract/Makefile.am                    |    7 +-
 src/tracker-extract/tracker-extract-jpeg.c         |    2 +-
 src/tracker-extract/tracker-extract-pdf.c          |    2 +-
 src/tracker-extract/tracker-extract-png.c          |    2 +-
 src/tracker-extract/tracker-extract-tiff.c         |    2 +-
 src/tracker-extract/tracker-extract.c              |    2 +-
 src/tracker-extract/tracker-xmp.c                  |    9 +-
 src/tracker-miner-fs/tracker-config.c              |   20 +
 src/tracker-miner-fs/tracker-main.c                |   12 -
 src/tracker-miner-fs/tracker-miner-applications.c  |    8 +-
 src/tracker-miner-fs/tracker-miner-files.c         |  148 ++++--
 src/tracker-preferences/tracker-preferences.ui     |  409 +++++++++------
 src/tracker-search-tool/tracker-entry.gs           |    3 +-
 src/tracker-status-icon/Makefile.am                |    5 +-
 src/tracker-store/Makefile.am                      |    2 +
 src/tracker-store/tracker-dbus.c                   |   11 +-
 src/tracker-store/tracker-events.c                 |    4 +
 src/tracker-store/tracker-main.c                   |   37 ++-
 src/tracker-store/tracker-push.c                   |    8 +-
 src/tracker-store/tracker-resources.c              |   84 +++-
 src/tracker-store/tracker-resources.h              |    9 +-
 src/tracker-store/tracker-store.c                  |   30 +
 src/tracker-store/tracker-store.h                  |    2 +
 src/tracker-store/tracker-writeback.c              |  178 +++++++
 src/tracker-store/tracker-writeback.h              |   45 ++
 src/tracker-utils/tracker-sparql.c                 |   26 +-
 src/tracker-writeback/.gitignore                   |    1 +
 src/tracker-writeback/Makefile.am                  |   98 ++++
 src/tracker-writeback/tracker-config.c             |  365 +++++++++++++
 src/tracker-writeback/tracker-config.h             |   61 +++
 src/tracker-writeback/tracker-main.c               |  230 ++++++++
 src/tracker-writeback/tracker-marshal.list         |    2 +
 src/tracker-writeback/tracker-writeback-consumer.c |  272 ++++++++++
 src/tracker-writeback/tracker-writeback-consumer.h |   58 ++
 .../tracker-writeback-dbus.h}                      |   32 +-
 .../tracker-writeback-dispatcher.c                 |  357 +++++++++++++
 .../tracker-writeback-dispatcher.h                 |   59 ++
 src/tracker-writeback/tracker-writeback-file.c     |  145 +++++
 src/tracker-writeback/tracker-writeback-file.h     |   59 ++
 src/tracker-writeback/tracker-writeback-module.c   |  165 ++++++
 src/tracker-writeback/tracker-writeback-module.h   |   60 +++
 src/tracker-writeback/tracker-writeback-mp3.c      |  152 ++++++
 src/tracker-writeback/tracker-writeback-xmp.c      |  325 +++++++++++
 src/tracker-writeback/tracker-writeback.c          |   62 +++
 src/tracker-writeback/tracker-writeback.h          |   65 +++
 tests/libtracker-common/Makefile.am                |   28 +-
 tests/libtracker-common/tracker-type-utils-test.c  |    1 -
 tests/libtracker-data/.gitignore                   |    1 +
 tests/libtracker-data/Makefile.am                  |    6 +
 tests/libtracker-data/tracker-sparql-blank-test.c  |  118 ++++
 utils/services/gen-doc.sh                          |    4 +-
 utils/services/resources/nepomuk-logo.png          |  Bin 0 -> 11107 bytes
 utils/services/resources/nie-maemo.css             |    2 +
 utils/services/resources/tracker-logo.png          |  Bin 0 -> 7331 bytes
 utils/services/ttl_html.c                          |   54 ++-
 utils/services/ttl_loader.c                        |    8 +
 utils/services/ttl_model.c                         |   13 +-
 utils/services/ttl_model.h                         |    1 +
 126 files changed, 5609 insertions(+), 960 deletions(-)
---