Revert last commit as we do still need to deal with uris.

Fri May 30 23:33:17 2008  Søren Sandmann  <sandmann@redhat.com>

	* Revert last commit as we do still need to deal with uris.


svn path=/trunk/; revision=14213

ChangeLog

+Fri May 30 23:33:17 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* Revert last commit as we do still need to deal with uris.
+
 Fri May 30 22:16:51 2008  Søren Sandmann  <sandmann@redhat.com>
 
 	* libnautilus-private/nautilus-directory-background.c
@@ -7,10 +11,6 @@ Fri May 30 22:16:51 2008  Søren Sandmann  <sandmann@redhat.com>
 	API
 	* configure.in: Require SVN version of eel
 
-Fri May 30 22:16:10 2008  Søren Sandmann  <sandmann@redhat.com>
-
-	* libnautilus-private/nautilus-directory-background.c
-
 Fri May 30 21:25:59 2008  Søren Sandmann  <sandmann@redhat.com>
 
 	* libnautilus-private/nautilus-directory-background.c

configure.in

@@ -4,7 +4,7 @@ dnl ===========================================================================
 
 m4_define(bonobo_activation_minver,    2.1.0)
 m4_define(bonobo_minver,               2.1.0)
-m4_define(eel_minver,                  2.23.2)
+m4_define(eel_minver,                  2.21.90)
 m4_define(glib_minver,                 2.15.6)
 m4_define(gnome_desktop_minver,        2.9.91)
 m4_define(gnome_minver,                2.14.0)

libnautilus-private/nautilus-directory-background.c

@@ -437,7 +437,7 @@ nautilus_file_background_is_set (EelBackground *background)
 	gboolean is_set;
 	
 	color = eel_background_get_color (background);
-	image = eel_background_get_image_filename (background);
+	image = eel_background_get_image_uri (background);
 
         is_set = (color || image);
         
@@ -462,7 +462,7 @@ background_changed_callback (EelBackground *background,
         
 
 	color = eel_background_get_color (background);
-	image = eel_background_get_image_filename (background);
+	image = eel_background_get_image_uri (background);
 
 	if (eel_background_is_desktop (background)) {
 		nautilus_file_background_write_desktop_settings (color, image, eel_background_get_image_placement (background));
@@ -560,7 +560,7 @@ initialize_background_from_settings (NautilusFile *file,
                  file);
 
         eel_background_set_color (background, color);
-        eel_background_set_image_filename (background, image);
+        eel_background_set_image_uri (background, image);
         eel_background_set_image_placement (background, placement);
         
 	/* Unblock the handler. */

src/nautilus-information-panel.c

@@ -334,7 +334,7 @@ information_panel_has_background (NautilusInformationPanel *information_panel)
 	background = eel_get_widget_background (GTK_WIDGET(information_panel));
 
 	color = eel_background_get_color (background);
-	image = eel_background_get_image_filename (background);
+	image = eel_background_get_image_uri (background);
 	
 	has_background = (color || image);
 
@@ -682,7 +682,7 @@ background_settings_changed_callback (EelBackground *background, GdkDragAction a
 					 information_panel);
 
 	color = eel_background_get_color (background);
-	image = eel_background_get_image_filename (background);
+	image = eel_background_get_image_uri (background);
 
 	if (action != NAUTILUS_DND_ACTION_SET_AS_BACKGROUND) {
 		nautilus_file_set_metadata (information_panel->details->file,
@@ -992,7 +992,7 @@ nautilus_information_panel_update_appearance (NautilusInformationPanel *informat
 		g_free (information_panel->details->current_background_image);
 		information_panel->details->current_background_image = g_strdup (background_image);
 
-		eel_background_set_image_filename (background, background_image);
+		eel_background_set_image_uri (background, background_image);
 		eel_background_set_color (background, background_color);
 
 		nautilus_sidebar_title_select_text_color

test/test.c

@@ -54,18 +54,18 @@ test_gtk_widget_set_background_image (GtkWidget *widget,
 				      const char *image_name)
 {
 	EelBackground *background;
-	char *filename;
+	char *uri;
 
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 	g_return_if_fail (image_name != NULL);
 
 	background = eel_get_widget_background (widget);
 	
-	filename = g_strdup_printf ("%s/%s", NAUTILUS_DATADIR, image_name);
+	uri = g_strdup_printf ("file://%s/%s", NAUTILUS_DATADIR, image_name);
 
-	eel_background_set_image_filename (background, filename);
+	eel_background_set_image_uri (background, uri);
 
-	g_free (filename);
+	g_free (uri);
 }
 
 void