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

[Martyn James Russell <mr src gnome org>]

commit 729df5ebe93e4b680c03e1f0f0f97290be505cac
Merge: 799e2f7 c0f5abc
Author: Jürg Billeter <j bitron ch>
Date:   Thu Sep 10 11:17:09 2009 +0200

    Merge branch 'master' into harmattan

 configure.ac                                       |   45 +-
 data/Makefile.am                                   |   14 +-
 data/{tracker.pc.in => tracker-client.pc.in}       |    4 +-
 data/{libtracker-gtk.pc.in => tracker-gtk.pc.in}   |    0
 docs/manpages/Makefile.am                          |    4 +-
 docs/manpages/tracker-search.1                     |   31 +-
 docs/manpages/tracker-sparql.1                     |   58 +-
 .../{tracker-applet.1 => tracker-status-icon.1}    |   10 +-
 po/POTFILES.in                                     |    8 +-
 po/POTFILES.skip                                   |    2 +-
 po/sv.po                                           |  893 ++++----
 src/Makefile.am                                    |   10 +-
 src/{libtracker => libtracker-client}/COPYING.LIB  |    0
 src/{libtracker => libtracker-client}/Makefile.am  |   12 +-
 src/{libtracker => libtracker-client}/tracker.c    |    0
 src/{libtracker => libtracker-client}/tracker.h    |    0
 src/libtracker-common/tracker-config-file.c        |    1 +
 src/libtracker-common/tracker-keyfile-object.c     |    4 +
 src/libtracker-common/tracker-ontology.c           |    9 +-
 src/libtracker-common/tracker-utils.c              |   57 +
 src/libtracker-common/tracker-utils.h              |    3 +
 src/libtracker-data/tracker-data-manager.c         |    5 -
 src/libtracker-data/tracker-data-update.c          |   40 +-
 src/libtracker-db/tracker-db-backup.c              |    1 -
 src/libtracker-gtk/Makefile.am                     |    4 +-
 src/libtracker-gtk/tracker-keyword-store.h         |    2 +-
 src/libtracker-gtk/tracker-metadata-tile.h         |    2 +-
 src/libtracker-gtk/tracker-tag-bar.h               |    2 +-
 src/libtracker-gtk/tracker-utils.h                 |    2 +-
 src/libtracker-miner/Makefile.am                   |    2 +-
 src/libtracker-miner/tracker-crawler.c             |   55 +-
 src/libtracker-miner/tracker-crawler.h             |    2 +
 src/libtracker-miner/tracker-miner-fs.c            |   65 +-
 src/libtracker-miner/tracker-miner.c               |   32 +-
 src/libtracker-miner/tracker-miner.h               |    2 +-
 src/libtracker-miner/tracker-monitor.c             |   19 +-
 src/tracker-applet/Makefile.am                     |   70 -
 src/tracker-applet/tracker-applet-prefs.ui         |  294 ---
 src/tracker-applet/tracker-applet.c                | 2376 --------------------
 src/tracker-applet/tracker-applet.h                |   59 -
 src/tracker-applet/tracker-marshal-main.c          |    2 -
 src/tracker-applet/tracker-marshal.list            |    3 -
 src/tracker-extract/Makefile.am                    |    8 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |    6 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   14 +-
 src/tracker-extract/tracker-extract-mp3.c          |   34 +-
 src/tracker-extract/tracker-extract-pdf.c          |    2 +-
 src/tracker-extract/tracker-extract-png.c          |    2 +-
 src/tracker-extract/tracker-extract-text.c         |  300 +++
 src/tracker-extract/tracker-extract-tiff.c         |   28 +-
 src/tracker-extract/tracker-extract-vorbis.c       |    4 +-
 src/tracker-extract/tracker-extract.c              |    6 +-
 src/tracker-extract/tracker-xmp.c                  |    2 +-
 src/tracker-fts/tracker-fts.c                      |    1 -
 src/tracker-miner-fs/Makefile.am                   |    2 +-
 src/tracker-miner-fs/tracker-config.c              |    2 +-
 src/tracker-miner-fs/tracker-miner-applications.c  |   51 +-
 src/tracker-miner-fs/tracker-miner-files.c         |   11 +-
 src/tracker-preferences/Makefile.am                |    2 +-
 src/tracker-preferences/tracker-preferences.c      |    2 +-
 src/tracker-search-tool/Makefile.am                |    3 +-
 src/tracker-search-tool/tracker-search-tool.h      |    2 +-
 .../.gitignore                                     |    0
 src/tracker-status-icon/Makefile.am                |   41 +
 .../tracker-applet-default.png                     |  Bin 1210 -> 1210 bytes
 .../tracker-applet-indexing1.png                   |  Bin 1130 -> 1130 bytes
 .../tracker-applet-indexing2.png                   |  Bin 1153 -> 1153 bytes
 .../tracker-applet-paused.png                      |  Bin 1098 -> 1098 bytes
 .../tracker-main.c                                 |    4 +-
 .../tracker-status-icon.c                          |  180 ++-
 .../tracker-status-icon.desktop.in.in}             |    2 +-
 .../tracker-status-icon.h                          |    0
 src/tracker-store/tracker-statistics.c             |    4 -
 src/tracker-utils/Makefile.am                      |    2 +-
 src/tracker-utils/tracker-import.c                 |    2 +-
 src/tracker-utils/tracker-info.c                   |    2 +-
 src/tracker-utils/tracker-search.c                 |  578 +++++-
 src/tracker-utils/tracker-sparql.c                 |  347 +++-
 src/tracker-utils/tracker-stats.c                  |    2 +-
 src/tracker-utils/tracker-status.c                 |    2 +-
 src/tracker-utils/tracker-tag.c                    |    2 +-
 tests/tracker-miner-fs/Makefile.am                 |    2 +-
 82 files changed, 2241 insertions(+), 3615 deletions(-)
---