rpms/gnome-panel/devel can-do-crash.patch, NONE, 1.1 gnome-panel.spec, 1.283, 1.284

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3108

Modified Files:
	gnome-panel.spec 
Added Files:
	can-do-crash.patch 
Log Message:
fix a possible crash


can-do-crash.patch:

--- NEW FILE can-do-crash.patch ---
diff -up gnome-panel-2.22.0/applets/clock/set-timezone.c.can-do-crash gnome-panel-2.22.0/applets/clock/set-timezone.c
--- gnome-panel-2.22.0/applets/clock/set-timezone.c.can-do-crash	2008-04-02 17:13:46.000000000 -0400
+++ gnome-panel-2.22.0/applets/clock/set-timezone.c	2008-04-02 17:13:56.000000000 -0400
@@ -139,6 +139,9 @@ can_do (const gchar *pk_action_id)
         DBusError dbus_error;
 	gint res = 0;
 
+        pk_caller = NULL;
+        pk_action = NULL;
+
 	system_bus = dbus_g_connection_get_connection (get_system_bus ());
 	if (system_bus == NULL)
 		goto out;
@@ -147,9 +150,6 @@ can_do (const gchar *pk_action_id)
 	if (pk_context == NULL)
 		goto out;
 	
-        pk_caller = NULL;
-        pk_action = NULL;
-
         pk_action = polkit_action_new ();
         polkit_action_set_action_id (pk_action, pk_action_id);
 


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- gnome-panel.spec	28 Mar 2008 15:27:52 -0000	1.283
+++ gnome-panel.spec	2 Apr 2008 22:08:11 -0000	1.284
@@ -121,6 +121,7 @@
 Patch28: gnome-panel-larger-find-window.patch
 Patch29: set-time-window.patch
 Patch30: location-edit.patch
+Patch31: can-do-crash.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -175,6 +176,7 @@
 %patch28 -p1 -b .larger-find-window
 %patch29 -p1 -b .set-time-window
 %patch30 -p1 -b .location-edit
+%patch31 -p1 -b .can-do-crash
 
 . %{SOURCE6}
 
@@ -359,6 +361,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Apr  2 2008 Matthias Clasen  <mclasen at redhat.com> - 2.22.0-9
+- Fix a possible crash in the clock applet
+
 * Fri Mar 28 2008 Matthias Clasen  <mclasen at redhat.com> - 2.22.0-8
 - Fix editing of locations in the clock applet