Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df5a31cac00ddab9ecce7c1272949e96df8e81c0

commit df5a31cac00ddab9ecce7c1272949e96df8e81c0
Author: bouleetbil <[email protected]>
Date:   Sun May 29 22:18:52 2011 +0200

nm-applet-0.8.999-2-i686
*fix crash with some invalid connections

diff --git a/source/gnome/nm-applet/FrugalBuild 
b/source/gnome/nm-applet/FrugalBuild
index 4bd060c..de9e320 100644
--- a/source/gnome/nm-applet/FrugalBuild
+++ b/source/gnome/nm-applet/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=nm-applet
_F_gnome_name=network-manager-applet
pkgver=0.8.999
-pkgrel=1
+pkgrel=2
pkgdesc="Network Management applet"
depends=('gconf' 'gtk+3' 'gnome-keyring>=3.0.0' \
'networkmanager>=0.8.999' 'polkit-gnome' \
@@ -13,11 +13,13 @@ depends=('gconf' 'gtk+3' 'gnome-keyring>=3.0.0' \
makedepends=('perl-xml-parser' 'intltool')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
- _F_gnome_schemas=('/etc/gconf/schemas/nm-applet.schemas')
+_F_gnome_schemas=('/etc/gconf/schemas/nm-applet.schemas')
_F_gnome_desktop="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-sha1sums=('b346ecd2935be521f568cfc76576cccf75fd0fed')
+sha1sums=('b346ecd2935be521f568cfc76576cccf75fd0fed' \
+          '34e31f79312b2886b6ea25abd733c3e37feeda90')
+source=($source crash.diff)
_F_cd_path=$_F_gnome_name-$pkgver
Fconfopts="$Fconfopts --with-gtkver=3"

diff --git a/source/gnome/nm-applet/crash.diff 
b/source/gnome/nm-applet/crash.diff
new file mode 100644
index 0000000..6e1e6be
--- /dev/null
+++ b/source/gnome/nm-applet/crash.diff
@@ -0,0 +1,37 @@
+From 27c4558761e59716959f6ceb91491d0230ace729 Mon Sep 17 00:00:00 2001
+From: Jiří KlimeÅ¡ <[email protected]>
+Date: Tue, 17 May 2011 12:10:25 +0000
+Subject: editor: don't crash in edit_done_cb() when connection is invalid (rh 
#704848)
+
+info structure was g_free()d in connection_updated_cb() and then used by
+g_signal_emit().
+---
+diff --git a/src/connection-editor/nm-connection-list.c 
b/src/connection-editor/nm-connection-list.c
+index f60d8af..ff459fd 100644
+--- a/src/connection-editor/nm-connection-list.c
++++ b/src/connection-editor/nm-connection-list.c
+@@ -662,6 +662,7 @@ edit_done_cb (NMConnectionEditor *editor, gint response, 
GError *error, gpointer
+                                          NM_REMOTE_CONNECTION (connection),
+                                          connection_updated_cb,
+                                          info);
++                      g_signal_emit (info->list, list_signals[EDITING_DONE], 
0, 0);
+               } else {
+                       g_warning ("%s: invalid connection after update: bug in 
the "
+                                  "'%s' / '%s' invalid: %d",
+@@ -671,10 +672,12 @@ edit_done_cb (NMConnectionEditor *editor, gint response, 
GError *error, gpointer
+                       connection_updated_cb (info->list,
+                                              NM_REMOTE_CONNECTION 
(connection),
+                                              edit_error,
+-                                             info);
++                                             NULL);
+                       g_error_free (edit_error);
++
++                      g_signal_emit (info->list, list_signals[EDITING_DONE], 
0, 0);
++                      g_free (info);
+               }
+-              g_signal_emit (info->list, list_signals[EDITING_DONE], 0, 0);
+               break;
+       case GTK_RESPONSE_NONE:
+               /* Show an error dialog if the editor initialization failed */
+--
+cgit v0.9
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to