r12666 - in /desktop/unstable/gtk+2.0/debian: changelog patches/031_gtksearchenginetracker_fixes.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Sep 21 10:48:54 2007
New Revision: 12666

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12666
Log:
* 031_gtksearchenginetracker_fixes.patch: new patch.
  + Use libtrackerclient.so.0 (closes: #443403).
  + Check that tracker actually works before using it.

Added:
    desktop/unstable/gtk+2.0/debian/patches/031_gtksearchenginetracker_fixes.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=12666&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Fri Sep 21 10:48:54 2007
@@ -1,3 +1,11 @@
+gtk+2.0 (2.12.0-3) UNRELEASED; urgency=low
+
+  * 031_gtksearchenginetracker_fixes.patch: new patch.
+    + Use libtrackerclient.so.0 (closes: #443403).
+    + Check that tracker actually works before using it.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 21 Sep 2007 12:47:46 +0200
+
 gtk+2.0 (2.12.0-2) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: desktop/unstable/gtk+2.0/debian/patches/031_gtksearchenginetracker_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/031_gtksearchenginetracker_fixes.patch?rev=12666&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/031_gtksearchenginetracker_fixes.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/031_gtksearchenginetracker_fixes.patch Fri Sep 21 10:48:54 2007
@@ -1,0 +1,55 @@
+Index: gtk+-2.12.0/gtk/gtksearchenginetracker.c
+===================================================================
+--- gtk+-2.12.0.orig/gtk/gtksearchenginetracker.c	2007-09-21 12:45:21.092692030 +0200
++++ gtk+-2.12.0/gtk/gtksearchenginetracker.c	2007-09-21 12:46:33.856838622 +0200
+@@ -35,6 +35,7 @@
+ 
+ static TrackerClient * (*tracker_connect) (gboolean enable_warnings) = NULL;
+ static void	       (*tracker_disconnect) (TrackerClient *client) = NULL;
++static int             (*tracker_get_version) (TrackerClient *client, GError **error) = NULL;
+ static void            (*tracker_cancel_last_call) (TrackerClient *client) = NULL;
+ 
+ static void (*tracker_search_metadata_by_text_async) (TrackerClient *client, 
+@@ -56,6 +57,7 @@
+ #define MAP(a) { #a, (gpointer *)&a }
+   MAP (tracker_connect),
+   MAP (tracker_disconnect),
++  MAP (tracker_get_version),
+   MAP (tracker_cancel_last_call),
+   MAP (tracker_search_metadata_by_text_async),
+   MAP (tracker_search_metadata_by_text_and_location_async),
+@@ -74,7 +76,7 @@
+       
+       done = TRUE;
+  
+-      tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
++      tracker = g_module_open ("libtrackerclient.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+       if (!tracker)
+ 	return;
+       
+@@ -279,6 +281,7 @@
+ {
+   GtkSearchEngineTracker *engine;
+   TrackerClient *tracker_client;
++  GError *err = NULL;
+ 
+   open_libtracker ();
+ 
+@@ -290,6 +293,17 @@
+   if (!tracker_client)
+     return NULL;
+ 
++  if (!tracker_get_version)
++    return NULL;
++
++  tracker_get_version (tracker_client, &err);
++
++  if (err != NULL)
++    {
++      g_error_free (err);
++      return NULL;
++    }
++
+   engine = g_object_new (GTK_TYPE_SEARCH_ENGINE_TRACKER, NULL);
+ 
+   engine->priv->client = tracker_client;

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=12666&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Fri Sep 21 10:48:54 2007
@@ -10,6 +10,7 @@
 020_immodules-files-d.patch
 021_loader-files-d.patch
 030_gtkentry_password-char-circle.patch
+031_gtksearchenginetracker_fixes.patch
 033_treeview_resizing.patch
 040_filechooser_single-click.patch
 041_ia32-libs.patch