- Don't draw background twice at startup

This commit is contained in:
Ray Strode 2008-09-24 20:41:59 +00:00
parent 688f98d06e
commit d48690b289
2 changed files with 20 additions and 5 deletions

View File

@ -1,6 +1,7 @@
--- gnome-settings-daemon-2.23.92/plugins/background/gsd-background-manager.c 2008-08-04 10:25:52.000000000 -0400 diff -up gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c.fade gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c
+++ fade/plugins/background/gsd-background-manager.c 2008-09-18 21:48:20.000000000 -0400 --- gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c.fade 2008-08-04 10:25:52.000000000 -0400
@@ -174,6 +174,7 @@ +++ gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c 2008-09-24 16:37:50.000000000 -0400
@@ -174,6 +174,7 @@ draw_background (GsdBackgroundManager *m
GdkScreen *screen; GdkScreen *screen;
GdkWindow *root_window; GdkWindow *root_window;
GdkPixmap *pixmap; GdkPixmap *pixmap;
@ -8,7 +9,7 @@
screen = gdk_display_get_screen (display, i); screen = gdk_display_get_screen (display, i);
@@ -185,7 +186,9 @@ @@ -185,7 +186,9 @@ draw_background (GsdBackgroundManager *m
gdk_screen_get_height (screen), gdk_screen_get_height (screen),
TRUE); TRUE);
@ -19,3 +20,14 @@
g_object_unref (pixmap); g_object_unref (pixmap);
} }
@@ -267,9 +270,7 @@ gsd_background_manager_start (GsdBackgro
"/apps/nautilus/preferences/show_desktop",
NULL);
- if (!nautilus_show_desktop) {
- draw_background (manager);
- } else {
+ if (nautilus_show_desktop) {
/* even when nautilus is supposedly handling the
* background, apply the settings eventually to make
* people running a nautilus-less session happy */

View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 2.24.0 Version: 2.24.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons Group: System Environment/Daemons
@ -159,6 +159,9 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc %{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog %changelog
* Wed Sep 28 2008 Ray Strode <rstrode@redhat.com> - 2.24.0-2
- Don't draw background twice at startup
* Tue Sep 23 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-1 * Tue Sep 23 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-1
- Update to 2.24.0 - Update to 2.24.0