nautilus r14246 - in branches/multiview: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Sun Jun  8 14:06:54 2008
New Revision: 14246
URL: http://svn.gnome.org/viewvc/nautilus?rev=14246&view=rev

Log:
2008-06-08  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-directory-background.c
	(initialize_background_from_settings):
	Use eel_background_set_image_uri() instead of *_sync().


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

Modified: branches/multiview/libnautilus-private/nautilus-directory-background.c
==============================================================================
--- branches/multiview/libnautilus-private/nautilus-directory-background.c	(original)
+++ branches/multiview/libnautilus-private/nautilus-directory-background.c	Sun Jun  8 14:06:54 2008
@@ -471,12 +471,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. */