From 4264a6ba6848e32a8e9a88a2d7bc8c3661383c5e Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 7 Mar 2016 15:14:35 +0100
Subject: [PATCH] Update to network-manager-applet 1.2-beta2

---
 .gitignore                                    |  1 +
 ...plet-workaround-crash-in-applet-code.patch | 46 +++++++++++++++++++
 network-manager-applet.spec                   | 13 ++++--
 sources                                       |  2 +-
 4 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 0001-applet-workaround-crash-in-applet-code.patch

diff --git a/.gitignore b/.gitignore
index 205c62c..795f75a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /network-manager-applet-1.0.6.tar.xz
 /network-manager-applet-1.2.0.tar.xz
 /network-manager-applet-1.1.90.tar.xz
+/network-manager-applet-1.1.91.tar.xz
diff --git a/0001-applet-workaround-crash-in-applet-code.patch b/0001-applet-workaround-crash-in-applet-code.patch
new file mode 100644
index 0000000..f377df8
--- /dev/null
+++ b/0001-applet-workaround-crash-in-applet-code.patch
@@ -0,0 +1,46 @@
+From 22468c05291d3d88ddc68f8983bffe54f29f5f82 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Fri, 4 Mar 2016 11:03:57 +0100
+Subject: [PATCH] applet: workaround crash in applet code
+
+rh#1313866 and rh#1314650 show a crash due to "g_assert (s_con)".
+It's unclear how this can happen, but for now downgrade the crash
+to a warning.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1313866
+https://bugzilla.redhat.com/show_bug.cgi?id=1314650
+---
+ src/applet.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/applet.c b/src/applet.c
+index 7ba7744..85f535c 100644
+--- a/src/applet.c
++++ b/src/applet.c
+@@ -1082,7 +1082,6 @@ applet_get_first_active_vpn_connection (NMApplet *applet,
+ 	for (i = 0; active_list && (i < active_list->len); i++) {
+ 		NMActiveConnection *candidate;
+ 		NMConnection *connection;
+-		NMSettingConnection *s_con;
+ 
+ 		candidate = g_ptr_array_index (active_list, i);
+ 
+@@ -1090,10 +1089,12 @@ applet_get_first_active_vpn_connection (NMApplet *applet,
+ 		if (!connection)
+ 			continue;
+ 
+-		s_con = nm_connection_get_setting_connection (connection);
+-		g_assert (s_con);
++		/* FIXME: rh#1313866 crashed on the following invariants for unknown reasons.
++		 * Downgrade crash to warning. */
++		g_warn_if_fail (NM_IS_CONNECTION (connection));
++		g_warn_if_fail (NM_IS_SETTING (nm_connection_get_setting_connection (connection)));
+ 
+-		if (!strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_VPN_SETTING_NAME)) {
++		if (nm_streq0 (nm_connection_get_connection_type (connection), NM_SETTING_VPN_SETTING_NAME)) {
+ 			if (out_state)
+ 				*out_state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (candidate));
+ 			return candidate;
+-- 
+2.5.0
+
diff --git a/network-manager-applet.spec b/network-manager-applet.spec
index 96d4737..374426f 100644
--- a/network-manager-applet.spec
+++ b/network-manager-applet.spec
@@ -3,7 +3,7 @@
 %global nm_version      1:1.1.0
 %global obsoletes_ver   1:0.9.7
 
-%global snapshot .beta1
+%global snapshot .beta2
 
 Name: network-manager-applet
 Summary: A network control and status applet for NetworkManager
@@ -14,8 +14,9 @@ License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
 
-Source: https://download.gnome.org/sources/network-manager-applet/1.1/%{name}-1.1.90.tar.xz
+Source: https://download.gnome.org/sources/network-manager-applet/1.1/%{name}-1.1.91.tar.xz
 Patch0: nm-applet-no-notifications.patch
+Patch1: 0001-applet-workaround-crash-in-applet-code.patch
 
 Requires: NetworkManager >= %{nm_version}
 Requires: NetworkManager-glib >= %{nm_version}
@@ -113,8 +114,9 @@ nm-applet, nm-connection-editor, and the GNOME control center.
 This package deprecates libnm-gtk.
 
 %prep
-%setup -q -n %{name}-1.1.90
-%patch0 -p1 -b .no-notifications
+%setup -q -n %{name}-1.1.91
+%patch0 -p1
+%patch1 -p1
 
 %build
 autoreconf -i -f
@@ -246,6 +248,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Mon Mar 07 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-0.3.beta2
+- Update to network-manager-applet 1.2-beta2
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-0.3.beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index db9015b..475c1d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c990580ec39f314409eb41c2a084e26b  network-manager-applet-1.1.90.tar.xz
+a7f7953e92ad0a868920dda54e67a1fc  network-manager-applet-1.1.91.tar.xz