goobox r367 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Mon Aug 18 06:51:26 2008
New Revision: 367
URL: http://svn.gnome.org/viewvc/goobox?rev=367&view=rev

Log:
2008-08-18  Paolo Bacchilega  <paobac svn gnome org>

	* src/dlg-ripper.c: use strcmp to check is scheme is void.
	
	* src/dlg-preferences.c: update the properties button sensitivity 
	before showing the preferences dialog.
	
	Fixes bug: Debian#495491: goobox: preferences dialog crash.
	Patch by Peter De Wachter.


Modified:
   trunk/ChangeLog
   trunk/src/dlg-preferences.c
   trunk/src/dlg-ripper.c

Modified: trunk/src/dlg-preferences.c
==============================================================================
--- trunk/src/dlg-preferences.c	(original)
+++ trunk/src/dlg-preferences.c	Mon Aug 18 06:51:26 2008
@@ -367,7 +367,7 @@
 	}
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (data->p_filetype_combobox), file_format);
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (data->p_encoding_notebook), file_format);
+	filetype_combobox_changed_cb (NULL, data);
 
 	/**/
 	
@@ -583,7 +583,7 @@
 		text = g_strdup_printf ("<big><b>%s</b></big>", _("FLAC"));
 		break;
 	default:
-		text = "";
+		text = g_strdup ("");
 		break;
 	}
 	gtk_label_set_markup (GTK_LABEL (f_title_label), text);
@@ -597,6 +597,7 @@
 		text = _("Compression level:");
 		break;
 	default:
+		text = "";
 		break;
 	}
 	gtk_label_set_text (GTK_LABEL (data->f_quality_label), text);
@@ -612,6 +613,7 @@
 		text = _("WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio.");
 		break;
 	default:
+		text = "";
 		break;
 	}
 	gtk_label_set_text (GTK_LABEL (f_description_label), text);

Modified: trunk/src/dlg-ripper.c
==============================================================================
--- trunk/src/dlg-ripper.c	(original)
+++ trunk/src/dlg-ripper.c	Mon Aug 18 06:51:26 2008
@@ -401,7 +401,7 @@
 		char   *url    = NULL;
 		
 		scheme = gnome_vfs_get_uri_scheme (folder);
-		if ((scheme == NULL) || (scheme == ""))
+		if ((scheme == NULL) || (strcmp (scheme, "") == 0))
 			url = gnome_vfs_get_uri_from_local_path (folder);
 		else
 			url = g_strdup (folder);