rhythmbox r6129 - in trunk: . shell

[jmatthew svn gnome org]

Author: jmatthew
Date: Sat Jan 17 00:10:54 2009
New Revision: 6129
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6129&view=rev

Log:
2009-01-17  Jonathan Matthew  <jonathan d14n org>

	based on patch by:  Michael Terry  <michael terry canonical com>

	* shell/rb-shell.c: (rb_shell_cmd_add_folder_to_library),
	(rb_shell_cmd_add_file_to_library):
	Don't try to set the file chooser's current location to '' when the
	state/add_dir gconf key isn't set.  Fixes #551035.


Modified:
   trunk/ChangeLog
   trunk/shell/rb-shell.c

Modified: trunk/shell/rb-shell.c
==============================================================================
--- trunk/shell/rb-shell.c	(original)
+++ trunk/shell/rb-shell.c	Sat Jan 17 00:10:54 2009
@@ -2452,7 +2452,7 @@
 				      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
 				      FALSE);
 	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-	if (dir)
+	if (dir && dir[0] != '\0')
 		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
 							 dir);
 
@@ -2474,7 +2474,7 @@
 				      GTK_FILE_CHOOSER_ACTION_OPEN,
 				      FALSE);
 	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-	if (dir)
+	if (dir && dir[0] != '\0')
 		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
 							 dir);