summaryrefslogtreecommitdiff
path: root/libnautilus-private/nautilus-directory-background.c
diff options
context:
space:
mode:
authorFrédéric Crozat <fcrozat@src.gnome.org>2002-01-02 19:24:40 +0000
committerFrédéric Crozat <fcrozat@src.gnome.org>2002-01-02 19:24:40 +0000
commit2b4a8d9728ce8d8917bd979ef24d4b0184c8912b (patch)
treecb633cdceaa9e49a6a77ff71b6fd9fdfca8393dd /libnautilus-private/nautilus-directory-background.c
parentd76687f09bd048edda2def0fa96cc4e9576ec165 (diff)
downloadnautilus-2b4a8d9728ce8d8917bd979ef24d4b0184c8912b.tar.gz
Remove flash when Nautilus desktop is started with a pixmap background
* libnautilus-private/nautilus-directory-background.c: (initialize_background_from_settings): Remove flash when Nautilus desktop is started with a pixmap background * src/nautilus-desktop-window.c: (map): Remove unneeded variable
Diffstat (limited to 'libnautilus-private/nautilus-directory-background.c')
-rw-r--r--libnautilus-private/nautilus-directory-background.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index fec249060..0b108fff8 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -819,7 +819,12 @@ initialize_background_from_settings (NautilusFile *file,
file);
eel_background_set_color (background, color);
- eel_background_set_image_uri (background, image);
+ if (background_is_desktop(background)) {
+ eel_background_set_image_uri_sync (background, image);
+ }
+ else {
+ eel_background_set_image_uri (background, image);
+ }
eel_background_set_image_placement (background, placement);
/* Unblock the handler. */