nautilus r14211 - in trunk: . libnautilus-private

[ssp svn gnome org]

Author: ssp
Date: Sat May 31 01:27:58 2008
New Revision: 14211
URL: http://svn.gnome.org/viewvc/nautilus?rev=14211&view=rev

Log:
Fri May 30 21:25:59 2008  SÃren Sandmann  <sandmann redhat com>

	* libnautilus-private/nautilus-directory-background.c
	(initialize_background_from_settings): Don't call
	eel_background_set_image_uri_sync() since it has been exactly
	identical to eel_background_set_image_uri() for a while.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-directory-background.c

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 01:27:58 2008
@@ -560,12 +560,7 @@
                  file);
 
         eel_background_set_color (background, color);
-        if (eel_background_is_desktop(background)) {
-                eel_background_set_image_uri_sync (background, image);
-        }
-        else {
-                eel_background_set_image_uri (background, image);
-        }
+        eel_background_set_image_uri (background, image);
         eel_background_set_image_placement (background, placement);
         
 	/* Unblock the handler. */