rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.25.2-fade.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.76, 1.77 gnome-settings-daemon-2.24.0-fade.patch, 1.2, NONE
Ray Strode
rstrode at fedoraproject.org
Thu Dec 4 19:50:43 UTC 2008
Author: rstrode
Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29956
Modified Files:
gnome-settings-daemon.spec
Added Files:
gnome-settings-daemon-2.25.2-fade.patch
Removed Files:
gnome-settings-daemon-2.24.0-fade.patch
Log Message:
- Rebase fade patch to apply with Behdad's updates to
g-s-d
gnome-settings-daemon-2.25.2-fade.patch:
--- NEW FILE gnome-settings-daemon-2.25.2-fade.patch ---
============================================================
Don't draw_background immediately when nautilus is disabled
gnome_bg_load_from_preferences forces a "changed" signal
to get emitted which will queue a draw anyway
diff --git a/plugins/background/gsd-background-manager.c b/plugins/background/gsd-background-manager.c
--- a/plugins/background/gsd-background-manager.c
+++ b/plugins/background/gsd-background-manager.c
@@ -277,7 +277,6 @@ gsd_background_manager_start (GsdBackgroundManager *manager,
if (!nautilus_show_desktop) {
setup_bg (manager);
- draw_background (manager);
} else {
/* even when nautilus is supposedly handling the
* background, apply the settings eventually to make
============================================================
Add crossfade transition when switching bgs
This uses the new gnome-desktop api for doing
crossfades between backgrounds. This only
matters if nautilus isn't running, since
otherwise, it would manage the crossfade.
diff --git a/plugins/background/gsd-background-manager.c b/plugins/background/gsd-background-manager.c
--- a/plugins/background/gsd-background-manager.c
+++ b/plugins/background/gsd-background-manager.c
@@ -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 *manager)
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,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
@@ -239,6 +255,11 @@ setup_bg (GsdBackgroundManager *manager)
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);
@@ -249,7 +270,7 @@ queue_draw_background (GsdBackgroundManager *manager)
{
manager->priv->timeout_id = 0;
setup_bg (manager);
- draw_background (manager);
+ draw_background (manager, FALSE);
return FALSE;
}
Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gnome-settings-daemon.spec 3 Dec 2008 23:42:58 -0000 1.76
+++ gnome-settings-daemon.spec 4 Dec 2008 19:50:11 -0000 1.77
@@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.25.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@@ -37,7 +37,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.24.0-fade.patch
+Patch8: gnome-settings-daemon-2.25.2-fade.patch
%description
A daemon to share settings from GNOME to other applications. It also
@@ -163,6 +163,10 @@
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
+* Thu Dec 4 2008 Ray Strode <rstrode at redhat.com> - 2.25.2-2
+- Rebase fade patch to apply with Behdad's updates to
+ g-s-d
+
* Wed Dec 3 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-1
- Ypdate to 2.25.2
--- gnome-settings-daemon-2.24.0-fade.patch DELETED ---
More information about the fedora-extras-commits
mailing list