rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.23.92-fade.patch, 1.1, 1.2 gnome-settings-daemon.spec, 1.58, 1.59

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13344

Modified Files:
	gnome-settings-daemon-2.23.92-fade.patch 
	gnome-settings-daemon.spec 
Log Message:
- Don't draw background twice at startup


gnome-settings-daemon-2.23.92-fade.patch:

Index: gnome-settings-daemon-2.23.92-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.23.92-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-2.23.92-fade.patch	19 Sep 2008 03:25:26 -0000	1.1
+++ gnome-settings-daemon-2.23.92-fade.patch	24 Sep 2008 20:41:59 -0000	1.2
@@ -1,6 +1,7 @@
---- gnome-settings-daemon-2.23.92/plugins/background/gsd-background-manager.c	2008-08-04 10:25:52.000000000 -0400
-+++ fade/plugins/background/gsd-background-manager.c	2008-09-18 21:48:20.000000000 -0400
-@@ -174,6 +174,7 @@
+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
+--- gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c.fade	2008-08-04 10:25:52.000000000 -0400
++++ 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;
                  GdkWindow *root_window;
                  GdkPixmap *pixmap;
@@ -8,7 +9,7 @@
  
                  screen = gdk_display_get_screen (display, i);
  
-@@ -185,7 +186,9 @@
+@@ -185,7 +186,9 @@ draw_background (GsdBackgroundManager *m
                                                   gdk_screen_get_height (screen),
                                                   TRUE);
  
@@ -19,3 +20,14 @@
  
                  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 */


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-settings-daemon.spec	23 Sep 2008 15:53:50 -0000	1.58
+++ gnome-settings-daemon.spec	24 Sep 2008 20:41:59 -0000	1.59
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.24.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -159,6 +159,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Sep 28 2008 Ray Strode <rstrode at redhat.com> - 2.24.0-2
+- Don't draw background twice at startup
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0