diff --git a/.gitignore b/.gitignore index 6e31a09..93cf5cb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /network-manager-applet-0.9.7.0.git20121016.tar.bz2 /network-manager-applet-0.9.7.0.git20121211.tar.bz2 /network-manager-applet-0.9.8.0.tar.bz2 +/network-manager-applet-0.9.8.1.git20130327.tar.bz2 +/network-manager-applet-0.9.8.1.git20130430.tar.bz2 diff --git a/network-manager-applet.spec b/network-manager-applet.spec index 4d0d099..8c5f401 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -5,13 +5,13 @@ %define nm_version 1:0.9.8.0 %define obsoletes_ver 1:0.9.7 -%define snapshot .git20130327 +%define snapshot .git20130430 %define realversion 0.9.8.1 Name: network-manager-applet Summary: A network control and status applet for NetworkManager Version: 0.9.8.1 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} Group: Applications/System License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -21,7 +21,6 @@ Source: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/%{name Patch0: nm-applet-no-notifications.patch Patch1: nm-applet-wifi-dialog-ui-fixes.patch Patch2: applet-ignore-deprecated.patch -Patch3: rh950925-applet-fix-pin-crash.patch Requires: NetworkManager >= %{nm_version} Requires: NetworkManager-glib >= %{nm_version} @@ -108,7 +107,6 @@ nm-applet, nm-connection-editor, and the GNOME control center. %patch0 -p1 -b .no-notifications %patch1 -p1 -b .applet-wifi-ui %patch2 -p1 -b .no-deprecated -%patch3 -p1 -b .fix-pin-crash %build autoreconf -i -f @@ -227,6 +225,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/gir-1.0/NMGtk-1.0.gir %changelog +* Tue Apr 30 2013 Dan Williams - 0.9.8.1-3.git20130430 +- editor: fix possible crash canceling connection edit dialog +- applet: only request secrets from the user when allowed to +- applet: fix signal icons with newer libpng +- applet: fix possible crash getting secrets with libsecret + * Thu Apr 18 2013 Jiří Klimeš - 0.9.8.1-2.git20130327 - applet: fix crash while getting a PIN to unlock a modem (rh #950925) diff --git a/rh950925-applet-fix-pin-crash.patch b/rh950925-applet-fix-pin-crash.patch deleted file mode 100644 index ddf99fc..0000000 --- a/rh950925-applet-fix-pin-crash.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 199ebe1e15a99da31e8c1ad3006df4df8d1d43fe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= -Date: Mon, 15 Apr 2013 09:29:56 +0200 -Subject: [PATCH] gsm: fix a crash while getting PIN from a keyring (rh - #950925) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -secret_service_search_finish() can return an empty list without any error. - -Signed-off-by: Jiří Klimeš ---- - src/applet-device-gsm.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/applet-device-gsm.c b/src/applet-device-gsm.c -index 2bf1ae4..a647fca 100644 ---- a/src/applet-device-gsm.c -+++ b/src/applet-device-gsm.c -@@ -811,10 +811,10 @@ keyring_pin_check_cb (GObject *source, - - list = secret_service_search_finish (NULL, result, &error); - -- if (error != NULL) { -+ if (!list) { - /* No saved PIN, just ask the user */ - unlock_dialog_new (info->device, info); -- g_error_free (error); -+ g_clear_error (&error); - return; - } - --- -1.7.11.7 - diff --git a/sources b/sources index 7922f2f..510e852 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -002ba0b88fb9cfcc88acbfb91877e708 network-manager-applet-0.9.8.1.git20130327.tar.bz2 +148f5754bfcc54bbebb4f66afa637c02 network-manager-applet-0.9.8.1.git20130430.tar.bz2