r12629 - in /desktop/unstable/nautilus/debian: changelog patches/15_tracker_check.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Sep 20 16:15:30 2007
New Revision: 12629

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12629
Log:
* 15_tracker_check.patch: new patch, properly checks that tracker is 
  installed before using it. Closes: #439863.

Added:
    desktop/unstable/nautilus/debian/patches/15_tracker_check.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=12629&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Thu Sep 20 16:15:30 2007
@@ -1,3 +1,10 @@
+nautilus (2.18.3-4) UNRELEASED; urgency=low
+
+  * 15_tracker_check.patch: new patch, properly checks that tracker is 
+    installed before using it. Closes: #439863.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 20 Sep 2007 17:56:58 +0200
+
 nautilus (2.18.3-3) unstable; urgency=low
 
   * New patch, 60_combobox-changed-signal, fix a crash with newer Gtk emitting

Added: desktop/unstable/nautilus/debian/patches/15_tracker_check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/15_tracker_check.patch?rev=12629&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/15_tracker_check.patch (added)
+++ desktop/unstable/nautilus/debian/patches/15_tracker_check.patch Thu Sep 20 16:15:30 2007
@@ -1,0 +1,26 @@
+Index: nautilus-2.18.3/libnautilus-private/nautilus-search-engine-tracker.c
+===================================================================
+--- nautilus-2.18.3.orig/libnautilus-private/nautilus-search-engine-tracker.c	2007-09-20 17:34:57.761647469 +0200
++++ nautilus-2.18.3/libnautilus-private/nautilus-search-engine-tracker.c	2007-09-20 17:56:42.023973144 +0200
+@@ -259,6 +259,7 @@
+ {
+ 	NautilusSearchEngineTracker *engine;
+ 	TrackerClient *tracker_client;
++	GError *err = NULL;
+ 
+ 	tracker_client =  tracker_connect (FALSE);
+ 
+@@ -266,6 +267,13 @@
+ 		return NULL;
+ 	}
+ 
++	tracker_get_version (tracker_client, &err);
++
++	if (err != NULL) {
++		g_error_free (err);
++		return NULL;
++	}
++
+ 	engine = g_object_new (NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER, NULL);
+ 
+ 	engine->details->client = tracker_client;

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=12629&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Thu Sep 20 16:15:30 2007
@@ -10,6 +10,7 @@
 12_list-view_expand.patch
 13_thumbnail_size_pref.patch
 14_sidebar_network-protocol.patch
+15_tracker_check.patch
 20_upstream_nautilus-dnd-user-owned.patch -p0
 60_combobox-changed-signal.patch
 99_ltmain_as-needed.patch