[tracker/tracker-store: 9/9] Merge branch 'master' into tracker-store

[Jürg Billeter <juergbi src gnome org>]

commit 75080e7b489881ed15bacafe4a3d48afc776633f
Merge: 6983066... 6a9bab8...
Author: Jürg Billeter <j bitron ch>
Date:   Tue Jun 30 12:30:13 2009 +0200

    Merge branch 'master' into tracker-store

 configure.ac                                      |   13 +-
 po/POTFILES.in                                    |    4 +-
 src/libtracker-data/tracker-data-update.c         |    7 +
 src/libtracker-data/tracker-sparql-query.vala     |    7 +
 src/tracker-applet/Makefile.am                    |    4 +-
 src/tracker-applet/tracker-applet-prefs.glade     |  326 ---
 src/tracker-applet/tracker-applet-prefs.ui        |  294 +++
 src/tracker-applet/tracker-applet.c               |   39 +-
 src/tracker-miner-fs/tracker-indexer.c            |    6 +-
 src/tracker-preferences/Makefile.am               |    6 +-
 src/tracker-preferences/tracker-preferences.c     |  170 +-
 src/tracker-preferences/tracker-preferences.glade | 2384 ---------------------
 src/tracker-preferences/tracker-preferences.ui    | 2210 +++++++++++++++++++
 utils/services/.gitignore                         |    1 +
 14 files changed, 2648 insertions(+), 2823 deletions(-)
---
diff --cc po/POTFILES.in
index f1a9dc8,e89059b..7dd7798
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -17,10 -16,10 +17,10 @@@ src/tracker-applet/tracker-applet.
  src/tracker-applet/tracker-applet.desktop.in.in
  src/tracker-extract/tracker-extract.c
  src/tracker-extract/tracker-main.c
 -src/tracker-indexer/tracker-main.c
 +src/tracker-miner-fs/tracker-main.c
  src/tracker-preferences/tracker-preferences.c
  src/tracker-preferences/tracker-preferences.desktop.in.in
- src/tracker-preferences/tracker-preferences.glade
+ [type: gettext/glade]src/tracker-preferences/tracker-preferences.ui
  src/tracker-search-tool/tracker-search-tool-callbacks.c
  src/tracker-search-tool/tracker-search-tool-support.c
  src/tracker-search-tool/tracker-search-tool.c