diff options
| author | Frédéric Crozat <fcrozat@src.gnome.org> | 2002-01-02 19:24:40 +0000 |
|---|---|---|
| committer | Frédéric Crozat <fcrozat@src.gnome.org> | 2002-01-02 19:24:40 +0000 |
| commit | 2b4a8d9728ce8d8917bd979ef24d4b0184c8912b (patch) | |
| tree | cb633cdceaa9e49a6a77ff71b6fd9fdfca8393dd | |
| parent | d76687f09bd048edda2def0fa96cc4e9576ec165 (diff) | |
| download | nautilus-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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-background.c | 7 | ||||
| -rw-r--r-- | src/nautilus-desktop-window.c | 4 |
3 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2002-01-02 Frederic Crozat <fcrozat@mandrakesoft.com> + + * 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 + 2001-12-18 Michael Meeks <michael@ximian.com> * components/hardware/nautilus-hardware-view.c 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. */ diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c index fa170df03..0e67ec2c4 100644 --- a/src/nautilus-desktop-window.c +++ b/src/nautilus-desktop-window.c @@ -287,10 +287,6 @@ realize (GtkWidget *widget) static void map (GtkWidget *widget) { - NautilusDesktopWindow *window; - - window = NAUTILUS_DESKTOP_WINDOW (widget); - set_window_background (widget, FALSE, FALSE, None, 0); /* Chain up to realize our children */ |