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

[Martyn James Russell <mr src gnome org>]

commit f3fa1c9c070e383ecab7fc05149d4ed414f670dd
Merge: f593b58 2341f36
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jan 21 17:04:12 2010 +0000

    Merge branch 'master' into harmattan

 Makefile.am                                        |    1 +
 NEWS                                               |   99 +++
 configure.ac                                       |   60 +--
 data/Makefile.am                                   |    9 +-
 data/dbus/Makefile.am                              |    1 +
 data/dbus/tracker-extract.xml                      |    5 -
 data/dbus/tracker-miner-files-reindex.xml          |   10 +
 data/ontologies/11-rdf.ontology                    |    6 +-
 data/ontologies/34-nmo.ontology                    |   16 +
 data/ontologies/40-mlo.ontology                    |  189 +++++-
 data/tracker-extract.pc.in                         |   12 +
 data/tracker-miner.pc.in                           |    2 +-
 docs/manpages/tracker-control.1                    |    6 -
 docs/manpages/tracker-miner-fs.cfg.5               |    6 +-
 docs/reference/Makefile.am                         |    1 +
 docs/reference/libtracker-common/Makefile.am       |    2 +-
 docs/reference/libtracker-extract/Makefile.am      |   58 ++
 .../libtracker-extract-docs.sgml                   |   43 ++
 .../libtracker-extract-sections.txt                |   27 +
 docs/reference/libtracker-extract/version.xml.in   |    1 +
 docs/reference/libtracker-miner/Makefile.am        |    2 +-
 examples/libtracker-miner/Makefile.am              |    2 +-
 m4/.gitignore                                      |    1 +
 po/es.po                                           |  269 ++++----
 po/sl.po                                           |  106 ++--
 src/Makefile.am                                    |    1 +
 src/libtracker-common/tracker-language.c           |    4 +-
 src/libtracker-data/Makefile.am                    |    3 +-
 src/libtracker-data/libtracker-data.vapi           |    2 +-
 src/libtracker-data/tracker-data-update.c          |    8 +-
 src/libtracker-data/tracker-sparql-query.vala      |   40 +-
 src/libtracker-db/libtracker-db.vapi               |    8 +-
 src/libtracker-db/tracker-db-journal.c             |   18 +-
 src/libtracker-db/tracker-db-manager.c             |   51 ++-
 src/libtracker-extract/Makefile.am                 |   49 ++
 .../tracker-exif.c                                 |  126 ++--
 .../tracker-exif.h                                 |   46 +-
 src/libtracker-extract/tracker-extract.h           |  164 ++++
 src/libtracker-extract/tracker-iptc.c              |  235 ++++++
 .../tracker-iptc.h                                 |   38 +-
 src/libtracker-extract/tracker-xmp.c               |  779 ++++++++++++++++++++
 src/libtracker-extract/tracker-xmp.h               |   93 +++
 src/libtracker-miner/Makefile.am                   |    9 +-
 src/libtracker-miner/tracker-miner-fs.c            |  134 +++--
 src/plugins/evolution/Makefile.am                  |    2 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |   89 ++-
 src/plugins/kmail/Makefile.am                      |    1 +
 src/plugins/nautilus/Makefile.am                   |    3 +-
 src/tracker-control/Makefile.am                    |   22 +-
 src/tracker-control/tracker-control.c              |  108 ++--
 src/tracker-extract/Makefile.am                    |  160 +++--
 src/tracker-extract/dummy.c                        |   36 +-
 src/tracker-extract/tracker-albumart.c             |   33 -
 src/tracker-extract/tracker-albumart.h             |    2 +-
 src/tracker-extract/tracker-extract-abw.c          |   13 +-
 .../tracker-extract-gstreamer-helix.c              |   11 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |   17 +-
 src/tracker-extract/tracker-extract-html.c         |    8 +-
 src/tracker-extract/tracker-extract-imagemagick.c  |    7 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   75 +-
 src/tracker-extract/tracker-extract-libxine.c      |    7 +-
 src/tracker-extract/tracker-extract-mockup.c       |    6 +-
 src/tracker-extract/tracker-extract-mp3.c          |   19 +-
 src/tracker-extract/tracker-extract-mplayer.c      |    8 +-
 src/tracker-extract/tracker-extract-msoffice.c     |  216 +++++-
 src/tracker-extract/tracker-extract-oasis.c        |   38 +-
 src/tracker-extract/tracker-extract-pdf.c          |  111 ++--
 src/tracker-extract/tracker-extract-playlist.c     |   17 +-
 src/tracker-extract/tracker-extract-png.c          |  106 ++--
 src/tracker-extract/tracker-extract-ps.c           |   11 +-
 src/tracker-extract/tracker-extract-text.c         |    6 +-
 src/tracker-extract/tracker-extract-tiff.c         |   77 +-
 src/tracker-extract/tracker-extract-totem.c        |   12 +-
 src/tracker-extract/tracker-extract-vorbis.c       |    4 +-
 src/tracker-extract/tracker-extract-xmp.c          |   10 +-
 src/tracker-extract/tracker-extract.c              |   27 +-
 src/tracker-extract/tracker-iptc.c                 |  177 -----
 src/tracker-extract/tracker-main.h                 |   23 +-
 src/tracker-extract/tracker-msword.cpp             |  109 ---
 src/tracker-extract/tracker-topanalyzer.h          |    6 +-
 src/tracker-extract/tracker-xmp.c                  |  769 -------------------
 src/tracker-extract/tracker-xmp.h                  |   58 --
 src/tracker-miner-fs/Makefile.am                   |   11 +-
 src/tracker-miner-fs/tracker-config.c              |   45 --
 src/tracker-miner-fs/tracker-config.h              |    3 -
 src/tracker-miner-fs/tracker-dbus.c                |  191 +++++
 .../tracker-dbus.h}                                |   16 +-
 src/tracker-miner-fs/tracker-main.c                |   37 +-
 src/tracker-miner-fs/tracker-miner-files-reindex.c |  163 ++++
 src/tracker-miner-fs/tracker-miner-files-reindex.h |   58 ++
 src/tracker-miner-fs/tracker-miner-files.c         |   73 +-
 src/tracker-miner-fs/tracker-thumbnailer.c         |  407 ----------
 src/tracker-miner-fs/tracker-thumbnailer.h         |   40 -
 src/tracker-preferences/tracker-preferences.ui     |   16 -
 src/tracker-preferences/tracker-preferences.vala   |    7 -
 src/tracker-status-icon/Makefile.am                |    2 +-
 src/tracker-store/tracker-resources.c              |    5 +
 src/tracker-utils/Makefile.am                      |    4 +-
 src/tracker-utils/tracker-search.c                 |   65 ++-
 src/tracker-writeback/Makefile.am                  |    2 +-
 tests/libtracker-data/functions/Makefile.am        |    6 +-
 tests/libtracker-data/functions/data-2.ontology    |   20 +
 tests/libtracker-data/functions/data-2.ttl         |   12 +
 .../functions/functions-tracker-2.out              |    3 +
 .../functions/functions-tracker-2.rq               |    9 +
 tests/libtracker-data/nie/filter-description-1.out |   15 +
 tests/libtracker-data/nie/filter-title-1.out       |   15 +
 tests/libtracker-data/tracker-sparql-test.c        |    1 +
 tests/libtracker-db/tracker-db-journal.c           |   10 +-
 tests/tracker-miner-fs/Makefile.am                 |    1 -
 utils/data-generators/generate-data-for-gossip.py  |  314 ++++++---
 utils/data-generators/internals/tools.py           |    5 +-
 112 files changed, 3922 insertions(+), 2780 deletions(-)
---