rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.24.0-fade.patch, 1.1, 1.2 gnome-settings-daemon.spec, 1.68, 1.69

[Ray Strode]

Author: rstrode

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

Modified Files:
	gnome-settings-daemon-2.24.0-fade.patch 
	gnome-settings-daemon.spec 
Log Message:
- Hold off on settings-daemon fade if nautilus is going to do
  it anyway.


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

Index: gnome-settings-daemon-2.24.0-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.24.0-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-2.24.0-fade.patch	12 Oct 2008 17:06:54 -0000	1.1
+++ gnome-settings-daemon-2.24.0-fade.patch	14 Oct 2008 20:09:59 -0000	1.2
@@ -1,6 +1,6 @@
 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-10-12 12:28:24.000000000 -0400
++++ gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c	2008-10-14 15:50:08.000000000 -0400
 @@ -155,7 +155,8 @@ nautilus_is_running (void)
  }
  
@@ -53,7 +53,7 @@
  }
  
  static void
-@@ -252,6 +268,11 @@ gsd_background_manager_start (GsdBackgro
+@@ -252,9 +268,12 @@ gsd_background_manager_start (GsdBackgro
                            G_CALLBACK (on_bg_changed),
                            manager);
  
@@ -63,16 +63,34 @@
 +                          manager);
 +
          watch_bg_preferences (manager);
-         gnome_bg_load_from_preferences (manager->priv->bg,
-                                         manager->priv->client);
-@@ -267,9 +288,7 @@ gsd_background_manager_start (GsdBackgro
+-        gnome_bg_load_from_preferences (manager->priv->bg,
+-                                        manager->priv->client);
+ 
+         /* If this is set, nautilus will draw the background and is
+ 	 * almost definitely in our session.  however, it may not be
+@@ -266,14 +285,22 @@ gsd_background_manager_start (GsdBackgro
+         nautilus_show_desktop = gconf_client_get_bool (manager->priv->client,
                                                         "/apps/nautilus/preferences/show_desktop",
                                                         NULL);
++        if (nautilus_show_desktop) {
++
++                gnome_bg_ignore_changes (manager->priv->bg, TRUE);
++
++                gnome_bg_load_from_preferences (manager->priv->bg,
++                                                manager->priv->client);
++
++                gnome_bg_ignore_changes (manager->priv->bg, FALSE);
  
 -        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 */
+                 manager->priv->timeout_id = g_timeout_add_seconds (8, (GSourceFunc)queue_draw_background, manager);
++        } else {
++                gnome_bg_load_from_preferences (manager->priv->bg,
++                                                manager->priv->client);
+         }
+ 
+         gnome_settings_profile_end (NULL);


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gnome-settings-daemon.spec	14 Oct 2008 18:38:23 -0000	1.68
+++ gnome-settings-daemon.spec	14 Oct 2008 20:10:00 -0000	1.69
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.24.0
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -165,6 +165,10 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Oct 14 2008 Ray Strode <rstrode at redhat.com> - 2.24.0-12
+- Hold off on settings-daemon fade if nautilus is going to do
+  it anyway.
+
 * Tue Oct 14 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-11
 - Show the shutdown dialog when the power button is pressed