nautilus r14213 - in trunk: . libnautilus-private src test

[ssp svn gnome org]

Author: ssp
Date: Sat May 31 03:34:36 2008
New Revision: 14213
URL: http://svn.gnome.org/viewvc/nautilus?rev=14213&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libnautilus-private/nautilus-directory-background.c
   trunk/src/nautilus-information-panel.c
   trunk/test/test.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat May 31 03:34:36 2008
@@ -4,7 +4,7 @@
 
 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)

Modified: trunk/libnautilus-private/nautilus-directory-background.c
==============================================================================
--- trunk/libnautilus-private/nautilus-directory-background.c	(original)
+++ trunk/libnautilus-private/nautilus-directory-background.c	Sat May 31 03:34:36 2008
@@ -437,7 +437,7 @@
 	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 @@
         
 
 	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 @@
                  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. */

Modified: trunk/src/nautilus-information-panel.c
==============================================================================
--- trunk/src/nautilus-information-panel.c	(original)
+++ trunk/src/nautilus-information-panel.c	Sat May 31 03:34:36 2008
@@ -334,7 +334,7 @@
 	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 @@
 					 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 @@
 		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

Modified: trunk/test/test.c
==============================================================================
--- trunk/test/test.c	(original)
+++ trunk/test/test.c	Sat May 31 03:34:36 2008
@@ -54,18 +54,18 @@
 				      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