rhythmbox r5711 - in trunk: . sources

[jmatthew svn gnome org]

Author: jmatthew
Date: Fri May 30 00:12:20 2008
New Revision: 5711
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5711&view=rev

Log:
2008-05-30  Jonathan Matthew  <jonathan d14n org>

	* sources/rb-library-source.c (rb_library_source_constructor):
	Convert default music directory to a URI before setting it in gconf.
	Fixes #487415.  Patch more or less by Alexander Gitter.


Modified:
   trunk/ChangeLog
   trunk/sources/rb-library-source.c

Modified: trunk/sources/rb-library-source.c
==============================================================================
--- trunk/sources/rb-library-source.c	(original)
+++ trunk/sources/rb-library-source.c	Fri May 30 00:12:20 2008
@@ -302,8 +302,13 @@
 	/* Set up the default library location if there's no library location set */
 	list = eel_gconf_get_string_list (CONF_LIBRARY_LOCATION);
 	if (g_slist_length (list) == 0) {
-		list = g_slist_prepend (list, g_strdup (rb_music_dir ()));
-		eel_gconf_set_string_list (CONF_LIBRARY_LOCATION, list);
+		char *music_dir_uri;
+
+		music_dir_uri = g_filename_to_uri (rb_music_dir (), NULL, NULL);
+		if (music_dir_uri != NULL) {
+			list = g_slist_prepend (list, music_dir_uri);
+			eel_gconf_set_string_list (CONF_LIBRARY_LOCATION, list);
+		}
 	}
 	rb_slist_deep_free (list);