Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 393624 Details for
Bug 536224
gnome-base/gnome-control-center-3.14.2: Version check rejects NetworkManager 1.x
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
network: Also work with NM 1.0
network-Also-work-with-NM-10.patch (text/plain), 2.20 KB, created by
poncho
on 2015-01-10 16:47:24 UTC
(
hide
)
Description:
network: Also work with NM 1.0
Filename:
MIME Type:
Creator:
poncho
Created:
2015-01-10 16:47:24 UTC
Size:
2.20 KB
patch
obsolete
>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 >--- a/panels/network/cc-network-panel.c >+++ b/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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 536224
: 393624