leigh123linux pushed to cinnamon-control-center (epel7). "fix bz 1210701"

[notifications at fedoraproject.org]

>From 9aa1980d7400f3269baf38f78f7f394915a893e9 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Fri, 10 Apr 2015 13:17:06 +0100
Subject: fix bz 1210701


diff --git a/0001-Remove-the-NetworkManager-version-checking-altogethe.patch b/0001-Remove-the-NetworkManager-version-checking-altogethe.patch
new file mode 100644
index 0000000..a016bdf
--- /dev/null
+++ b/0001-Remove-the-NetworkManager-version-checking-altogethe.patch
@@ -0,0 +1,59 @@
+From c53b915aec80928a1be96c6d0eb6645e415e18f9 Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux at googlemail.com>
+Date: Sun, 1 Mar 2015 08:35:52 +0000
+Subject: [PATCH 4/7] Remove the NetworkManager version checking altogether
+
+---
+ panels/network/cc-network-panel.c | 19 +++----------------
+ 1 file changed, 3 insertions(+), 16 deletions(-)
+
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index df64bd1..d247c90 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -940,30 +940,17 @@ static gboolean
+ panel_check_network_manager_version (CcNetworkPanel *panel)
+ {
+         const gchar *version;
+-        gchar **split = NULL;
+-        guint major = 0;
+-        guint micro = 0;
+-        guint minor = 0;
+         gboolean ret = TRUE;
+ 
+         /* parse running version */
+         version = nm_client_get_version (panel->priv->client);
+-        if (version != NULL) {
+-                split = g_strsplit (version, ".", -1);
+-                major = atoi (split[0]);
+-                minor = atoi (split[1]);
+-                micro = atoi (split[2]);
+-        }
+-
+-        /* is it too new or old */
+-        if (major > 0 || major > 9 || (minor <= 8 && micro < 992)) {
++        if (version == NULL) {
+                 ret = FALSE;
+ 
+                 /* do modal dialog in idle so we don't block startup */
+                 panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
+         }
+ 
+-        g_strfreev (split);
+         return ret;
+ }
+ 
+@@ -1029,8 +1016,8 @@ on_toplevel_map (GtkWidget      *widget,
+ {
+         gboolean ret;
+ 
+-        /* is the user compiling against a new version, but running an
+-         * old daemon version? */
++        /* is the user compiling against a new version, but not running
++         * the daemon? */
+         ret = panel_check_network_manager_version (panel);
+         if (ret) {
+                 manager_running (panel->priv->client, NULL, panel);
+-- 
+1.9.3
+
diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index 8a160d7..d1acf44 100644
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -8,7 +8,7 @@
 Summary: Utilities to configure the Cinnamon desktop
 Name:    cinnamon-control-center
 Version: 2.0.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 # The following files contain code from
 # ISC for panels/network/rfkill.h
 # And MIT for wacom/calibrator/calibrator.c
@@ -30,6 +30,7 @@ Patch1:   cinnamon-control-center-2.0.7-upower_deprecated.patch
 Patch2:   region_cleanup.patch
 Patch3:   lang_change_logout.patch
 Patch4:   0001-Switch-to-x-cinnamon-session.patch
+Patch5:   0001-Remove-the-NetworkManager-version-checking-altogethe.patch
 
 Requires: cinnamon-settings-daemon >= %{csd_version}
 Requires: redhat-menus >= %{redhat_menus_version}
@@ -123,6 +124,7 @@ tar -xJf %{SOURCE1}
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 chmod +x autogen.sh
 NOCONFIGURE=1 ./autogen.sh
 
@@ -210,6 +212,9 @@ fi
 %{_libdir}/pkgconfig/libcinnamon-control-center.pc
 
 %changelog
+* Fri Apr 10 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.0.9-7
+- fix bz 1210701
+
 * Wed Jun 11 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.9-6
 - make cinnamon-nenu adjustments
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cinnamon-control-center.git/commit/?h=epel7&id=9aa1980d7400f3269baf38f78f7f394915a893e9