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

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

commit 47fcb5114a5acd9b286e7f60cff5e320962e9a00
Merge: 5c3caae... 56e7ba6...
Author: Jürg Billeter <j bitron ch>
Date:   Tue May 12 15:44:36 2009 +0200

    Merge branch 'master' into tracker-store

 configure.ac                                       |    4 +-
 data/Makefile.am                                   |    8 +-
 data/libtracker-gtk.pc.in                          |    2 +-
 data/ontologies/30-nie.ontology                    |    4 +
 data/ontologies/33-nfo.ontology                    |    1 +
 data/ontologies/34-nmo.ontology                    |   14 +-
 ...acker-module-1.0.pc.in => tracker-module.pc.in} |    2 +-
 data/tracker.pc.in                                 |    2 +-
 po/de.po                                           | 2078 +++++++++++++-------
 po/es.po                                           |  330 ++--
 po/it.po                                           |    1 -
 src/libtracker-common/Makefile.am                  |    2 +-
 src/libtracker-common/tracker-albumart.c           |   77 +-
 src/libtracker-common/tracker-hal.c                |   39 +-
 src/libtracker-data/tracker-sparql-query.vala      |   33 +-
 src/libtracker-gtk/Makefile.am                     |    2 +-
 src/libtracker-gtk/tracker-gtk.h                   |   10 +-
 src/libtracker/Makefile.am                         |    4 +-
 src/libtracker/tracker.c                           |    2 +-
 src/plugins/evolution/Makefile.am                  |    1 +
 src/plugins/kmail/Makefile.am                      |    1 +
 src/plugins/rss/Makefile.am                        |    1 +
 src/tracker-extract/tracker-extract-mp3.c          |  197 ++-
 src/tracker-extract/tracker-extract.c              |   33 +-
 src/tracker-extract/tracker-main.c                 |   16 +-
 src/tracker-indexer/Makefile.am                    |    2 +-
 src/tracker-indexer/tracker-indexer.c              |   37 +-
 src/tracker-indexer/tracker-removable-device.c     |   46 +-
 src/tracker-search-tool/Makefile.am                |    1 +
 .../tracker-search-tool-callbacks.c                |    2 +-
 src/tracker-search-tool/tracker-search-tool.c      |    2 +-
 src/trackerd/tracker-status.c                      |  181 ++-
 tests/libtracker-common/.gitignore                 |    1 +
 tests/libtracker-common/Makefile.am                |   15 +-
 tests/libtracker-common/mock-dbus-gproxy.c         |   61 +
 tests/libtracker-common/mock-dbus-gproxy.h         |   54 +
 tests/libtracker-common/mock-thumbnailer-dbus.c    |   80 +
 tests/libtracker-common/tracker-thumbnailer-test.c |  186 ++
 tests/libtracker-data/Makefile.am                  |    4 +-
 utils/albumart/albumart-strip.c                    |   12 +-
 40 files changed, 2388 insertions(+), 1160 deletions(-)

diff --cc src/tracker-indexer/tracker-indexer.c
index 034932d,afc1b6d..7b78098
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@@ -1030,13 -1156,18 +1024,17 @@@ static voi
  item_add_or_update (TrackerIndexer        *indexer,
  		    PathInfo              *info,
  		    const gchar           *uri,
 -		    TrackerModuleMetadata *metadata,
 -		    const gchar           *text)
 +		    TrackerModuleMetadata *metadata)
  {
 -	guint32 id;
  	gchar *mount_point = NULL;
 +	gchar *sparql;
  
+ 	if (G_UNLIKELY (!indexer->private->in_transaction)) {
+ 		start_transaction (indexer);
+ 	}
+ 
 -	if (tracker_data_query_resource_exists (uri, &id)) {
 -		gchar *old_text;
 +	if (tracker_data_query_resource_exists (uri, NULL)) {
 +		gchar *full_sparql;
  
  		if (tracker_module_file_get_flags (info->module_file) & TRACKER_FILE_CONTENTS_STATIC) {
  			/* According to the module, the metadata can't change for this item */