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

[Martyn James Russell <mr src gnome org>]

commit 1f6c81fbe2bfd7de09f2d7c36788a0f2394d1ea3
Merge: 4cdf9e6 e551d8a
Author: Jürg Billeter <j bitron ch>
Date:   Wed Sep 16 13:30:26 2009 +0200

    Merge branch 'master' into harmattan

 .gitignore                                         |    2 +-
 data/dbus/Makefile.am                              |    4 +-
 ...=> org.freedesktop.Tracker1.Extract.service.in} |    0
 ...vice.in => org.freedesktop.Tracker1.service.in} |    0
 po/POTFILES.in                                     |    2 +-
 po/POTFILES.skip                                   |    1 +
 src/Makefile.am                                    |    2 +-
 src/libtracker-data/tracker-sparql-query.vala      |   53 +-
 src/libtracker-miner/tracker-miner-fs.c            |    8 +-
 src/libtracker-miner/tracker-miner.c               |    2 +-
 src/tracker-explorer/explorer.vala                 |    2 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |    2 +-
 src/tracker-extract/tracker-extract-mp3.c          |   19 +-
 src/tracker-miner-fs/tracker-config.c              |    7 +
 src/tracker-miner-fs/tracker-config.h              |    2 +
 src/tracker-preferences/Makefile.am                |   33 +-
 src/tracker-preferences/config.vapi                |    2 +
 src/tracker-preferences/tracker-config.vapi        |   50 +
 .../tracker-preferences-dialogs.c                  |   85 -
 .../tracker-preferences-dialogs.h                  |   31 -
 src/tracker-preferences/tracker-preferences-main.c |   46 -
 .../tracker-preferences-utils.c                    |  137 --
 .../tracker-preferences-utils.h                    |   48 -
 src/tracker-preferences/tracker-preferences.c      | 1201 -----------
 src/tracker-preferences/tracker-preferences.h      |   50 -
 src/tracker-preferences/tracker-preferences.ui     | 2174 ++++++--------------
 src/tracker-preferences/tracker-preferences.vala   |  375 ++++
 src/tracker-utils/tracker-info.c                   |    2 +-
 src/tracker-utils/tracker-search.c                 |    2 +-
 src/tracker-utils/tracker-stats.c                  |    2 +-
 src/tracker-utils/tracker-status.c                 |    2 +-
 src/tracker-utils/tracker-tag.c                    |    2 +-
 32 files changed, 1104 insertions(+), 3244 deletions(-)
---