rpms/gnome-desktop/devel gnome-desktop-2.25.1.1-fade.patch, 1.5, 1.6 gnome-desktop.spec, 1.194, 1.195

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29430

Modified Files:
	gnome-desktop-2.25.1.1-fade.patch gnome-desktop.spec 
Log Message:
- Stop cross fade before freeing pixmaps in finalize instead
  of after.


gnome-desktop-2.25.1.1-fade.patch:

Index: gnome-desktop-2.25.1.1-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop-2.25.1.1-fade.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-desktop-2.25.1.1-fade.patch	5 Dec 2008 14:36:10 -0000	1.5
+++ gnome-desktop-2.25.1.1-fade.patch	6 Jan 2009 16:18:18 -0000	1.6
@@ -255,7 +255,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/libgnome-desktop/gnome-bg-crossfade.c
-@@ -0,0 +1,541 @@
+@@ -0,0 +1,540 @@
 +/* gnome-bg-crossfade.h - fade window background between two pixmaps
 + *
 + * Copyright (C) 2008 Red Hat, Inc.
@@ -388,6 +388,8 @@
 +
 +	fade = GNOME_BG_CROSSFADE (object);
 +
++	gnome_bg_crossfade_stop (fade);
++
 +	if (fade->priv->fading_pixmap != NULL) {
 +		g_object_unref (fade->priv->fading_pixmap);
 +		fade->priv->fading_pixmap = NULL;
@@ -397,12 +399,6 @@
 +		g_object_unref (fade->priv->end_pixmap);
 +		fade->priv->end_pixmap = NULL;
 +	}
-+
-+	if (fade->priv->timeout_id != 0) {
-+		g_source_remove (fade->priv->timeout_id);
-+		fade->priv->timeout_id = 0;
-+	}
-+
 +}
 +
 +static void
@@ -694,6 +690,9 @@
 +static void
 +on_finished (GnomeBGCrossfade *fade)
 +{
++	if (fade->priv->timeout_id == 0)
++		return;
++
 +	g_assert (fade->priv->end_pixmap != NULL);
 +
 +	gdk_window_set_back_pixmap (fade->priv->window,


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- gnome-desktop.spec	17 Dec 2008 05:14:15 -0000	1.194
+++ gnome-desktop.spec	6 Jan 2009 16:18:18 -0000	1.195
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -124,6 +124,10 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Jan  6 2009 Ray Strode <rstrode at redhat.com> - 2.25.3-3
+- Stop cross fade before freeing pixmaps in finalize instead
+  of after.
+
 * Tue Dec 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3