rpms/gnome-panel/F-12 fix-clock-crash.patch, NONE, 1.1 gnome-panel.spec, 1.386, 1.387

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7907

Modified Files:
	gnome-panel.spec 
Added Files:
	fix-clock-crash.patch 
Log Message:
- Fix clock crash (bug 537798)


fix-clock-crash.patch:
 clock.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE fix-clock-crash.patch ---
>From 58d7ba0359ab128f30b39ea0518a69ed83a4e329 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 8 Dec 2009 14:48:58 -0500
Subject: [PATCH] Only call e_passwords_shutdown once

It doesn't appear to support being called multiple times
in a row.

It appears there was already an attempt to do this with a
reference counter called clock_numbers:

/* Used to count the number of clock instances. It's there to know when
 * we should free resources that are shared. */
static int clock_numbers = 0;

But the logic was wrong.
---
 applets/clock/clock.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index ddbbc16..c06530a 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -803,8 +803,11 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
 
 #ifdef HAVE_LIBECAL
 	if (clock_numbers > 0) {
-		e_passwords_shutdown ();
 		clock_numbers--;
+
+		if (clock_numbers == 0) {
+			e_passwords_shutdown ();
+		}
 	}
 #endif
 }
@@ -1385,8 +1388,10 @@ static void
 create_clock_widget (ClockData *cd)
 {
 #ifdef HAVE_LIBECAL
+	if (clock_numbers == 0) {
+		e_passwords_init ();
+	}
 	clock_numbers++;
-	e_passwords_init ();
 #endif
 
         /* Main toggle button */
-- 
1.6.5.2



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- gnome-panel.spec	10 Nov 2009 03:55:51 -0000	1.386
+++ gnome-panel.spec	8 Dec 2009 20:00:24 -0000	1.387
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -130,6 +130,9 @@ Patch45: icon-padding.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=341441
 Patch46: resolution-change.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=537798
+Patch47: fix-clock-crash.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -182,6 +185,7 @@ Panel Applets using the libpanel-applet 
 %patch44 -p1 -b .icon-order
 %patch45 -p1 -b .icon-padding
 %patch46 -p1 -b .resolution-change
+%patch47 -p1 -b .fix-clock-crash
 
 . %{SOURCE6}
 
@@ -389,6 +393,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Dec 08 2009 Ray Strode <rstrode at redhat.com> 2.28.0-16
+- Fix clock crash (bug 537798)
+
 * Mon Nov  9 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-15
 - Improve the behaviour of the panel when screen resolution
   changes (gnome #341441)