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

[Martyn James Russell <mr src gnome org>]

commit 777dac752f1275e15d174b48f3f78056e6477097
Merge: 6656108 383c79a
Author: Jürg Billeter <j bitron ch>
Date:   Mon Jun 22 16:50:12 2009 +0200

    Merge branch 'master' into harmattan

 configure.ac                                      |   51 +-
 data/languages/stopwords.hu                       |  264 +++---
 data/ontologies/20-dc.ontology                    |    4 +-
 data/ontologies/32-nco.ontology                   |   34 +-
 data/ontologies/33-nfo.ontology                   |   88 ++-
 data/ontologies/35-ncal.ontology                  |   43 +-
 data/ontologies/38-nmm.ontology                   |   85 ++-
 data/ontologies/40-mlo.description                |   10 +
 data/ontologies/40-mlo.ontology                   |  101 ++
 data/ontologies/Makefile.am                       |    1 +
 docs/manpages/Makefile.am                         |    1 -
 docs/manpages/tracker-thumbnailer.1               |   58 --
 po/sv.po                                          |  380 ++++----
 src/libtracker-common/Makefile.am                 |   35 +-
 src/libtracker-common/tracker-albumart.c          |   10 +-
 src/libtracker-common/tracker-file-utils.c        |   40 +
 src/libtracker-common/tracker-file-utils.h        |    3 +
 src/libtracker-common/tracker-os-dependant-unix.c |  126 ++-
 src/libtracker-common/tracker-power-devicekit.c   |  217 +++++
 src/libtracker-common/tracker-statement-list.c    |   27 +
 src/libtracker-common/tracker-statement-list.h    |    9 +-
 src/libtracker-common/tracker-storage-hal.c       |  346 +++++---
 src/libtracker-db/tracker-db-manager.c            |   14 +-
 src/libtracker-db/tracker-db-manager.h            |    2 +-
 src/plugins/evolution/tracker-evolution-plugin.c  |  527 +++++++++---
 src/tracker-extract/tracker-extract-albumart.c    |   96 ++-
 src/tracker-extract/tracker-extract-gstreamer.c   | 1021 ++++++++++----------
 src/tracker-extract/tracker-extract-mp3.c         |   41 +-
 src/tracker-extract/tracker-extract-msoffice.c    |    4 +-
 src/tracker-extract/tracker-extract-oasis.c       |    2 +-
 src/tracker-extract/tracker-extract-pdf.c         |    2 +-
 src/tracker-extract/tracker-extract-playlist.c    |   49 +-
 src/tracker-extract/tracker-extract-ps.c          |    2 +-
 src/tracker-extract/tracker-iptc.c                |   16 +-
 src/tracker-extract/tracker-main.c                |    4 +-
 src/tracker-indexer/tracker-events.c              |    3 +-
 src/tracker-indexer/tracker-indexer.c             |   41 +-
 src/tracker-utils/tracker-processes.c             |    5 +-
 src/trackerd/tracker-backup.c                     |   27 +-
 src/trackerd/tracker-crawler.c                    |   33 +-
 src/trackerd/tracker-daemon.c                     |    5 +-
 src/trackerd/tracker-main.c                       |  268 ++++--
 src/trackerd/tracker-monitor.c                    |   13 +-
 src/trackerd/tracker-processor.c                  | 1040 ++++++++++++---------
 src/trackerd/tracker-processor.h                  |    8 +
 src/trackerd/tracker-status.c                     |   99 ++-
 src/trackerd/tracker-status.h                     |    3 +
 utils/services/Makefile.am                        |   10 +-
 utils/services/data-validator.c                   |  229 +++++
 utils/services/resources/maemo-logo.gif           |  Bin 0 -> 3720 bytes
 utils/services/ttl_html.c                         |    8 +-
 51 files changed, 3616 insertions(+), 1889 deletions(-)
---