[cinnamon-control-center] remove the NetworkManager version checking altogether

[leigh123linux]

commit fe5ea0bf60115051d6e3da95907819f8cca60faf
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Mar 1 08:42:31 2015 +0000

    remove the NetworkManager version checking altogether

 ...NetworkManager-version-checking-altogethe.patch | 59 ++++++++++++++++++++++
 cinnamon-control-center.spec                       |  7 ++-
 2 files changed, 65 insertions(+), 1 deletion(-)
---
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..f94ee3c
--- /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] 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
+@@ -1311,30 +1311,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 || minor > 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;
+ }
+ 
+@@ -1381,8 +1368,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 58a14c6..4dbb493 100644
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -9,7 +9,7 @@
 Summary: Utilities to configure the Cinnamon desktop
 Name:    cinnamon-control-center
 Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # The following files contain code from
 # ISC for panels/network/rfkill.h
 # And MIT for wacom/calibrator/calibrator.c
@@ -28,6 +28,7 @@ Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-control-center/sourc
 Source1: http://packages.linuxmint.com/pool/main/m/mint-artwork-cinnamon/mint-artwork-cinnamon_%{_artwork_version}.tar.gz
 
 Patch0: hide_for_virtual_profiles.patch
+Patch1: 0001-Remove-the-NetworkManager-version-checking-altogethe.patch
 
 Requires: cinnamon-settings-daemon >= %{csd_version}
 Requires: redhat-menus >= %{redhat_menus_version}
@@ -118,6 +119,7 @@ utilities for testing Metacity/Muffin themes.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 tar -xf %{SOURCE1}
 NOCONFIGURE=1 ./autogen.sh
 
@@ -212,6 +214,9 @@ fi
 %{_libdir}/pkgconfig/libcinnamon-control-center.pc
 
 %changelog
+* Sun Mar 01 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.2-2
+- remove the NetworkManager version checking altogether
+
 * Tue Dec 02 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.2-1
 - update to 2.4.2
 - hide virtual profiles in colour plugin