r29662 - in /packages/experimental/rhythmbox/debian: changelog patches/01_fix_null_pointer_dereference.patch patches/series

[jeansch-guest at users.alioth.debian.org]

Author: jeansch-guest
Date: Fri Sep 16 15:22:27 2011
New Revision: 29662

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29662
Log:
* debian/patches/*
  - Fix a crash when a grilo source have no search capabilities
    (reported upstream b-g-o #659261)

Added:
    packages/experimental/rhythmbox/debian/patches/01_fix_null_pointer_dereference.patch
Modified:
    packages/experimental/rhythmbox/debian/changelog
    packages/experimental/rhythmbox/debian/patches/series

Modified: packages/experimental/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/changelog?rev=29662&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/changelog [utf-8] Fri Sep 16 15:22:27 2011
@@ -1,3 +1,11 @@
+rhythmbox (2.90.1~git20110915.42165b-2) experimental; urgency=low
+
+  * debian/patches/*
+    - Fix a crash when a grilo source have no search capabilities
+      (reported upstream b-g-o #659261)
+
+ -- Jean Schurger <jean at schurger.org>  Fri, 16 Sep 2011 11:08:51 -0400
+
 rhythmbox (2.90.1~git20110915.42165b-1) experimental; urgency=low
 
   * New upstream git snashot.

Added: packages/experimental/rhythmbox/debian/patches/01_fix_null_pointer_dereference.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/01_fix_null_pointer_dereference.patch?rev=29662&op=file
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/01_fix_null_pointer_dereference.patch (added)
+++ packages/experimental/rhythmbox/debian/patches/01_fix_null_pointer_dereference.patch [utf-8] Fri Sep 16 15:22:27 2011
@@ -1,0 +1,25 @@
+Author: Jean Schurger
+Description: Fix a crash when a grilo source have no search capabilities
+Bug: b-g-o #659261
+diff -uNr rhythmbox-2.90.1~git20110915.42165b.orig/plugins/grilo/rb-grilo-source.c rhythmbox-2.90.1~git20110915.42165b/plugins/grilo/rb-grilo-source.c
+--- rhythmbox-2.90.1~git20110915.42165b.orig/plugins/grilo/rb-grilo-source.c	2011-09-16 10:18:30.000000000 -0400
++++ rhythmbox-2.90.1~git20110915.42165b/plugins/grilo/rb-grilo-source.c	2011-09-16 11:13:14.551872154 -0400
+@@ -383,6 +383,8 @@
+ 		g_signal_connect (source->priv->search_entry, "activate", G_CALLBACK (search_cb), source);
+ 		gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (source->priv->search_entry));
+ 		gtk_box_pack_start (GTK_BOX (mainbox), align, FALSE, FALSE, 0);
++	} else {
++		source->priv->search_entry = NULL;
+ 	}
+ 
+ 	/* info bar */
+@@ -972,7 +974,8 @@
+ 		return;
+ 	}
+ 
+-	rb_search_entry_clear (source->priv->search_entry);
++	if (source->priv->search_entry != NULL)
++		rb_search_entry_clear (source->priv->search_entry);
+ 
+ 	gtk_tree_model_get (GTK_TREE_MODEL (source->priv->browser_model), &iter,
+ 			    0, &container,

Modified: packages/experimental/rhythmbox/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/series?rev=29662&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/series [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/patches/series [utf-8] Fri Sep 16 15:22:27 2011
@@ -1,0 +1,1 @@
+01_fix_null_pointer_dereference.patch