r19578 - in /desktop/lenny/sound-juicer/debian: changelog patches/02_prefs_crash.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Apr 14 12:24:55 2009
New Revision: 19578

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19578
Log:
02_prefs_crash.patch: backport patch from upstream. Fixes a crash 
when popping up the preferences dialog. Closes: #524040.

Added:
    desktop/lenny/sound-juicer/debian/patches/02_prefs_crash.patch
Modified:
    desktop/lenny/sound-juicer/debian/changelog

Modified: desktop/lenny/sound-juicer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/lenny/sound-juicer/debian/changelog?rev=19578&op=diff
==============================================================================
--- desktop/lenny/sound-juicer/debian/changelog (original)
+++ desktop/lenny/sound-juicer/debian/changelog Tue Apr 14 12:24:55 2009
@@ -1,3 +1,10 @@
+sound-juicer (2.22.0-3) stable; urgency=low
+
+  * 02_prefs_crash.patch: backport patch from upstream. Fixes a crash 
+    when popping up the preferences dialog. Closes: #524040.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 14 Apr 2009 14:22:55 +0200
+
 sound-juicer (2.22.0-2) unstable; urgency=low
 
   * 01_musicbrainz_message.patch: patch from Pekka Vuorela to fix 

Added: desktop/lenny/sound-juicer/debian/patches/02_prefs_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/lenny/sound-juicer/debian/patches/02_prefs_crash.patch?rev=19578&op=file
==============================================================================
--- desktop/lenny/sound-juicer/debian/patches/02_prefs_crash.patch (added)
+++ desktop/lenny/sound-juicer/debian/patches/02_prefs_crash.patch Tue Apr 14 12:24:55 2009
@@ -1,0 +1,14 @@
+--- trunk/src/sj-prefs.c	2008/03/04 17:57:31	2106
++++ trunk/src/sj-prefs.c	2008/03/05 14:58:08	2110
+@@ -123,8 +123,9 @@
+   current_uri = gconf_client_get_string (gconf_client, GCONF_BASEURI, NULL);
+   new_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)); 
+ 
+-  if (strcmp(current_uri, new_uri) != 0)  
+-    gconf_client_set_string (gconf_client, GCONF_BASEURI, new_uri, NULL);
++  if (current_uri == NULL || strcmp(current_uri, new_uri) != 0) {
++      gconf_client_set_string (gconf_client, GCONF_BASEURI, new_uri, NULL);
++  }
+   
+   g_free (new_uri);
+   g_free (current_uri);