pacho 15/01/17 15:39:50
Added:
cinnamon-control-center-2.4.2-networkmanager-version.patch
cinnamon-control-center-2.2.11-networkmanager-version.patch
Log:
Fix NM version checking, bug #536850 by Marcin SochoĊ (soki)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
A188FBD4)
Revision Changes Path
1.1
gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch?rev=1.1&content-type=text/plain
Index: cinnamon-control-center-2.4.2-networkmanager-version.patch
===================================================================
--- panels/network/cc-network-panel.c.old 2015-01-17 16:35:04.395520484
+0100
+++ panels/network/cc-network-panel.c 2015-01-17 16:36:11.706685966 +0100
@@ -1311,30 +1311,18 @@
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 +1369,9 @@
{
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.1
gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.11-networkmanager-version.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.11-networkmanager-version.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.11-networkmanager-version.patch?rev=1.1&content-type=text/plain
Index: cinnamon-control-center-2.2.11-networkmanager-version.patch
===================================================================
--- panels/network/cc-network-panel.c.old 2015-01-17 16:29:12.561444207
+0100
+++ panels/network/cc-network-panel.c 2015-01-17 16:30:46.778068711 +0100
@@ -940,30 +940,18 @@
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 +1017,9 @@
{
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);
