diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-08-17 22:31:50 -0400 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-08-17 22:31:50 -0400 |
commit | 527a634b8cb73e7c5bf6b99df3715028b205cd5d (patch) | |
tree | ac4803546b4183070a1b85578ee3db9045843045 /gnome-base/gnome-control-center/files | |
parent | c211c36cc28787940710344bf32c09f366c130de (diff) | |
download | gentoo-527a634b8cb73e7c5bf6b99df3715028b205cd5d.tar.gz gentoo-527a634b8cb73e7c5bf6b99df3715028b205cd5d.tar.xz |
gnome-base/gnome-control-center: clean up old
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'gnome-base/gnome-control-center/files')
-rw-r--r-- | gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch deleted file mode 100644 index 40f09d89bf0..00000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch +++ /dev/null @@ -1,63 +0,0 @@ -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
\ No newline at end of file |