diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-04-02 22:08:11 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-04-02 22:08:11 +0000 |
| commit | b463724ac5b873727f678076dd194aa00e4bdbb5 (patch) | |
| tree | 8d0a8b34ab10d668fb52a69a50e2afe0734be632 | |
| parent | 864031348b3cb70ff6237107c9f7a262f6691821 (diff) | |
| download | gnome-panel-b463724ac5b873727f678076dd194aa00e4bdbb5.tar.gz gnome-panel-b463724ac5b873727f678076dd194aa00e4bdbb5.tar.xz gnome-panel-b463724ac5b873727f678076dd194aa00e4bdbb5.zip | |
fix a possible crash
| -rw-r--r-- | can-do-crash.patch | 23 | ||||
| -rw-r--r-- | gnome-panel.spec | 5 |
2 files changed, 28 insertions, 0 deletions
diff --git a/can-do-crash.patch b/can-do-crash.patch new file mode 100644 index 0000000..aefc86b --- /dev/null +++ b/can-do-crash.patch @@ -0,0 +1,23 @@ +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); + diff --git a/gnome-panel.spec b/gnome-panel.spec index e3e0b47..d099b49 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -121,6 +121,7 @@ Patch27: populate.patch 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 @@ Panel Applets using the libpanel-applet library. %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 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Wed Apr 2 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-9 +- Fix a possible crash in the clock applet + * Fri Mar 28 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-8 - Fix editing of locations in the clock applet |