[gnome-desktop3/f16] fix a gnome-screensaver crash

[Matthias Clasen]

commit 21ab21989b7ea5686da8ff92cf64266c391977bc
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Sep 12 09:12:14 2011 -0400

    fix a gnome-screensaver crash

 ...ock-Remove-the-date-time-source-on-dispos.patch |   32 ++++++++++++++++++++
 gnome-desktop3.spec                                |    9 +++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0001-GnomeWallClock-Remove-the-date-time-source-on-dispos.patch b/0001-GnomeWallClock-Remove-the-date-time-source-on-dispos.patch
new file mode 100644
index 0000000..8a514e7
--- /dev/null
+++ b/0001-GnomeWallClock-Remove-the-date-time-source-on-dispos.patch
@@ -0,0 +1,32 @@
+From a65613bf0a507a226c172bb6f503e27532efb0fa Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Thu, 8 Sep 2011 19:01:35 +0200
+Subject: [PATCH] GnomeWallClock: Remove the date/time source on dispose
+
+We don't do it in finalize since the dispose handler needs the objects
+that are being disposed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658583
+---
+ libgnome-desktop/gnome-wall-clock.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-wall-clock.c
+index 49437d8..167619d 100644
+--- a/libgnome-desktop/gnome-wall-clock.c
++++ b/libgnome-desktop/gnome-wall-clock.c
+@@ -84,6 +84,11 @@ gnome_wall_clock_dispose (GObject *object)
+ {
+ 	GnomeWallClock *self = GNOME_WALL_CLOCK (object);
+ 
++	if (self->priv->clock_update_id) {
++		g_source_remove (self->priv->clock_update_id);
++		self->priv->clock_update_id = 0;
++	}
++
+ 	if (self->priv->tz_monitor != NULL) {
+ 		g_object_unref (self->priv->tz_monitor);
+ 		self->priv->tz_monitor = NULL;
+-- 
+1.7.6.2
+
diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index 14d840c..8f852dc 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -10,10 +10,13 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop3
 Version: 3.1.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/3.1/gnome-desktop-%{version}.tar.xz
 
+# upstream fix
+Patch0: 0001-GnomeWallClock-Remove-the-date-time-source-on-dispos.patch
+
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 
@@ -71,6 +74,7 @@ libgnomedesktop.
 
 %prep
 %setup -q -n gnome-desktop-%{version}
+%patch0 -p1
 
 %build
 %configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" \
@@ -106,6 +110,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %doc %{_datadir}/gtk-doc/html/gnome-desktop3/
 
 %changelog
+* Mon Sep 12 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.91-3
+- Fix a gnome-screensaver crash
+
 * Fri Sep  9 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.91-2
 - Require gsettings-desktop-schemas