rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.24.0-fade.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.62, 1.63 gnome-settings-daemon-2.23.92-fade.patch, 1.2, NONE

[Ray Strode]

Author: rstrode

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

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gnome-settings-daemon-2.24.0-fade.patch 
Removed Files:
	gnome-settings-daemon-2.23.92-fade.patch 
Log Message:
- Update fade patch to skip crossfade when changing frames in
  slideshow background.


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

--- NEW FILE gnome-settings-daemon-2.24.0-fade.patch ---
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
@@ -155,7 +155,8 @@ nautilus_is_running (void)
 }
 
 static void
-draw_background (GsdBackgroundManager *manager)
+draw_background (GsdBackgroundManager *manager,
+                 gboolean              use_crossfade)
 {
         GdkDisplay *display;
         int         n_screens;
@@ -185,7 +186,15 @@ draw_background (GsdBackgroundManager *m
                                                  gdk_screen_get_height (screen),
                                                  TRUE);
 
-                gnome_bg_set_pixmap_as_root (screen, pixmap);
+                if (use_crossfade) {
+                        GnomeBGCrossfade *fade;
+
+                        fade = gnome_bg_set_pixmap_as_root_with_crossfade (screen, pixmap, NULL);
+                        g_signal_connect (fade, "finished",
+                                          G_CALLBACK (g_object_unref), NULL);
+                } else {
+                        gnome_bg_set_pixmap_as_root (screen, pixmap);
+                }
 
                 g_object_unref (pixmap);
         }
@@ -197,7 +206,7 @@ static gboolean
 queue_draw_background (GsdBackgroundManager *manager)
 {
         manager->priv->timeout_id = 0;
-        draw_background (manager);
+        draw_background (manager, TRUE);
         return FALSE;
 }
 
@@ -205,7 +214,14 @@ static void
 on_bg_changed (GnomeBG              *bg,
                GsdBackgroundManager *manager)
 {
-        draw_background (manager);
+        draw_background (manager, TRUE);
+}
+
+static void
+on_bg_transitioned (GnomeBG              *bg,
+                    GsdBackgroundManager *manager)
+{
+        draw_background (manager, FALSE);
 }
 
 static void
@@ -252,6 +268,11 @@ gsd_background_manager_start (GsdBackgro
                           G_CALLBACK (on_bg_changed),
                           manager);
 
+        g_signal_connect (manager->priv->bg,
+                          "transitioned",
+                          G_CALLBACK (on_bg_transitioned),
+                          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
                                                        "/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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnome-settings-daemon.spec	11 Oct 2008 02:40:10 -0000	1.62
+++ gnome-settings-daemon.spec	12 Oct 2008 17:06:54 -0000	1.63
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.24.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -36,7 +36,7 @@
 Patch7:		gnome-settings-daemon-2.23.91-fnf7-cycle.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=552857
-Patch8:		gnome-settings-daemon-2.23.92-fade.patch
+Patch8:		gnome-settings-daemon-2.24.0-fade.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=554525
 Patch9:		fix-gdm-layout.patch
@@ -167,6 +167,10 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Sun Oct 12 2008 Ray Strode <rstrode at redhat.com> - 2.24.0-6
+- Update fade patch to skip crossfade when changing frames in
+  slideshow background.
+
 * Fri Oct 10 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-5
 - Fix the picking up of the gdm keyboard layout even more
 


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