r19582 - /desktop/lenny/sound-juicer/debian/patches/02_prefs_crash.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Apr 14 18:13:33 2009
New Revision: 19582

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19582
Log:
Whoops, the patch fixed the wrong crash /o\

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

Modified: 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=19582&op=diff
==============================================================================
--- desktop/lenny/sound-juicer/debian/patches/02_prefs_crash.patch (original)
+++ desktop/lenny/sound-juicer/debian/patches/02_prefs_crash.patch Tue Apr 14 18:13:33 2009
@@ -1,14 +1,22 @@
---- 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);
+--- trunk/src/sj-prefs.c	2009/02/07 17:58:12	2419
++++ trunk/src/sj-prefs.c	2009/02/10 21:48:09	2434
+@@ -134,6 +134,9 @@
+   gint active;
+   const char* pattern;
+   active = gtk_combo_box_get_active (combo);
++  if (active == -1)
++    return;
++
+   pattern = path_patterns[active].pattern;
+   if (pattern) {
+     gconf_client_set_string (gconf_client, GCONF_PATH_PATTERN, pattern, NULL);
+@@ -145,6 +148,9 @@
+   gint active;
+   const char* pattern;
+   active = gtk_combo_box_get_active (combo);
++  if (active == -1)
++    return;
++
+   pattern = file_patterns[active].pattern;
+   if (pattern) {
+     gconf_client_set_string (gconf_client, GCONF_FILE_PATTERN, pattern, NULL);