cinnamon-control-center: make NM-1.x work (apply patch from gnome).
This commit is contained in:
parent
5f2cb7ea23
commit
8efe2d8327
2 changed files with 64 additions and 1 deletions
|
@ -0,0 +1,63 @@
|
|||
From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 18 Dec 2014 08:04:00 +0100
|
||||
Subject: [PATCH] network: Also work with NM 1.0
|
||||
|
||||
Remove the NetworkManager version checking altogether. The code was made
|
||||
to check for now very old versions of NetworkManager, and anything newer
|
||||
than ancient should degrade gracefully if we support newer features.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=741661
|
||||
---
|
||||
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 90b265e..28f6158 100644
|
||||
--- panels/network/cc-network-panel.c
|
||||
+++ panels/network/cc-network-panel.c
|
||||
@@ -1321,30 +1321,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;
|
||||
}
|
||||
|
||||
@@ -1391,8 +1378,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);
|
||||
---
|
||||
2.1.0
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'cinnamon-control-center'
|
||||
pkgname=cinnamon-control-center
|
||||
version=2.4.2
|
||||
revision=1
|
||||
revision=2
|
||||
short_desc="The Cinnamon Control Center"
|
||||
build_options="systemd"
|
||||
build_style=gnu-configure
|
||||
|
|
Loading…
Reference in a new issue