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

[Martyn James Russell <mr src gnome org>]

commit fdd8442827266e9346fbfe31510374ef322e29a6
Merge: 7453293 8dd355c
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Feb 4 16:30:10 2010 +0000

    Merge branch 'master' into harmattan

 NEWS                                               |   69 +
 configure.ac                                       |   39 +-
 data/dbus/Makefile.am                              |    7 +-
 data/dbus/tracker-extract.xml                      |    3 +-
 data/ontologies/30-nie.ontology                    |    3 +-
 data/ontologies/40-mlo.ontology                    |    3 +-
 data/ontologies/41-mfo.ontology                    |    7 +
 docs/manpages/tracker-status.1                     |   65 +-
 docs/ontologies/mfo/explanation.xml                |    5 +
 docs/ontologies/mlo/explanation.xml                |   67 +
 docs/ontologies/mlo/location-overview.dia          |  Bin 0 -> 3853 bytes
 docs/reference/ontology/Makefile.am                |    1 +
 docs/tools/Makefile.am                             |    1 +
 docs/tools/ttl_sgml.c                              |   16 +-
 examples/rss-reader/rss_viewer.ui                  |    2 +-
 po/es.po                                           |  178 +-
 po/hu.po                                           |  164 +-
 po/zh_CN.po                                        | 2501 +-
 src/libtracker-client/tracker.c                    |    6 +-
 src/libtracker-common/tracker-file-utils.c         |   19 +
 src/libtracker-common/tracker-sparql-builder.vala  |   73 +-
 src/libtracker-common/tracker-storage-hal.c        |   12 +
 src/libtracker-data/tracker-data-update.c          |   24 +-
 src/libtracker-data/tracker-data-update.h          |    2 +-
 src/libtracker-data/tracker-sparql-query.vala      |    4 +-
 src/libtracker-extract/tracker-exif.c              |    8 +-
 src/libtracker-extract/tracker-exif.h              |    1 +
 src/libtracker-extract/tracker-extract.h           |   39 +-
 src/libtracker-extract/tracker-xmp.c               |   30 +-
 src/libtracker-extract/tracker-xmp.h               |    2 +
 src/libtracker-miner/Makefile.am                   |    6 +-
 src/libtracker-miner/tracker-miner-fs.c            |  231 +-
 src/libtracker-miner/tracker-miner-manager.c       |   34 +-
 src/libtracker-miner/tracker-miner.c               |    6 +-
 src/libtracker-miner/tracker-monitor.c             |   29 +-
 src/libtracker-miner/tracker-thumbnailer.c         |  382 +
 src/libtracker-miner/tracker-thumbnailer.h         |   39 +
 src/plugins/evolution/tracker-evolution-plugin.c   |    4 +-
 src/plugins/nautilus/tracker-tags-extension.c      |    1 +
 src/plugins/nautilus/tracker-tags-utils.c          |    5 +-
 src/plugins/nautilus/tracker-tags-view.c           |    5 +-
 src/tracker-control/tracker-control.c              |    7 +
 src/tracker-explorer/tracker-explorer.ui           |    4 +-
 src/tracker-extract/Makefile.am                    |   12 +
 src/tracker-extract/tracker-extract-abw.c          |    3 +-
 src/tracker-extract/tracker-extract-flac.c         |  336 +
 .../tracker-extract-gstreamer-helix.c              |   17 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |  215 +-
 src/tracker-extract/tracker-extract-html.c         |    3 +-
 src/tracker-extract/tracker-extract-imagemagick.c  |   11 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   67 +-
 src/tracker-extract/tracker-extract-libxine.c      |   29 +-
 src/tracker-extract/tracker-extract-mp3.c          |   59 +-
 src/tracker-extract/tracker-extract-mplayer.c      |   29 +-
 src/tracker-extract/tracker-extract-msoffice.c     |    9 +-
 src/tracker-extract/tracker-extract-oasis.c        |    7 +-
 src/tracker-extract/tracker-extract-pdf.c          |    7 +-
 src/tracker-extract/tracker-extract-playlist.c     |    7 +-
 src/tracker-extract/tracker-extract-png.c          |  286 +-
 src/tracker-extract/tracker-extract-ps.c           |    7 +-
 src/tracker-extract/tracker-extract-text.c         |    3 +-
 src/tracker-extract/tracker-extract-tiff.c         |  116 +-
 src/tracker-extract/tracker-extract-totem.c        |   35 +-
 src/tracker-extract/tracker-extract-vorbis.c       |   50 +-
 src/tracker-extract/tracker-extract-xmp.c          |    2 +
 src/tracker-extract/tracker-extract.c              |   99 +-
 src/tracker-miner-fs/tracker-main.c                |    8 +-
 src/tracker-miner-fs/tracker-miner-files.c         |  119 +-
 src/tracker-search-bar/tracker-results-window.c    |  103 +-
 src/tracker-utils/tracker-info.c                   |   32 +-
 src/tracker-utils/tracker-search.c                 |   60 +-
 src/tracker-utils/tracker-status.c                 |   67 +-
 src/tracker-utils/tracker-tag.c                    |   18 +-
 src/tracker-writeback/tracker-writeback-consumer.c |   13 +-
 src/tracker-writeback/tracker-writeback-mp3.c      |    4 +-
 src/tracker-writeback/tracker-writeback-playlist.c |    2 +-
 src/tracker-writeback/tracker-writeback-xmp.c      |  120 +-
 tests/functional-tests/04-group-concat.py          |   98 +
 tests/functional-tests/05-coalesce.py              |  123 +
 tests/functional-tests/Makefile.am                 |    7 +-
 tests/functional-tests/configuration.py            |   38 +
 tests/functional-tests/metadata_tc.py              |  137 +
 tests/functional-tests/testdata/Images/flower.gif  |  Bin 0 -> 956 bytes
 tests/functional-tests/testdata/Makefile.am        |   14 +
 tests/functional-tests/testdata/Music/Makefile.am  |   10 +
 tests/functional-tests/testdata/Music/row_row.mp3  |  Bin 0 -> 1012174 bytes
 tests/functional-tests/testdata/pickled_Images     |  Bin 0 -> 423 bytes
 tests/functional-tests/testdata/pickled_Music      |  Bin 0 -> 548 bytes
 tests/functional-tests/testdata/ttl/Makefile.am    |   11 +
 tests/functional-tests/testdata/ttl/bookmarks.ttl  |   93 +
 tests/functional-tests/testdata/ttl/contacts.ttl   |74329 ++++++++++++++++++++
 .../functional-tests/testdata/ttl/load_turtle.ttl  |  609 +
 .../functional-tests/testdata/ttl/planet-gnome.ttl |  470 +
 .../functional-tests/testdata/ttl/planet-maemo.ttl |  177 +
 tests/functional-tests/testdata/ttl/songlist.ttl   |60207 ++++++++++++++++
 .../functional-tests/testdata/ttl/songlist_nmm.ttl |  350 +
 tests/functional-tests/testdata/ttl/webhistory.ttl | 6011 ++
 tests/functional-tests/tests.xml                   |   12 +
 98 files changed, 146265 insertions(+), 2490 deletions(-)
---