[arch-commits] Commit in gnome-control-center/repos (12 files)

Jan de Groot jgc at archlinux.org
Mon Mar 23 11:32:39 UTC 2015


    Date: Monday, March 23, 2015 @ 12:32:39
  Author: jgc
Revision: 234544

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  gnome-control-center/repos/gnome-unstable-i686/PKGBUILD
    (from rev 234543, gnome-control-center/trunk/PKGBUILD)
  gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install
    (from rev 234543, gnome-control-center/trunk/gnome-control-center.install)
  gnome-control-center/repos/gnome-unstable-i686/network-Also-work-with-NM-10.patch
    (from rev 234543, gnome-control-center/trunk/network-Also-work-with-NM-10.patch)
  gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 234543, gnome-control-center/trunk/PKGBUILD)
  gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install
    (from rev 234543, gnome-control-center/trunk/gnome-control-center.install)
  gnome-control-center/repos/gnome-unstable-x86_64/network-Also-work-with-NM-10.patch
    (from rev 234543, gnome-control-center/trunk/network-Also-work-with-NM-10.patch)
Deleted:
  gnome-control-center/repos/gnome-unstable-i686/PKGBUILD
  gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install
  gnome-control-center/repos/gnome-unstable-i686/network-Also-work-with-NM-10.patch
  gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD
  gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install
  gnome-control-center/repos/gnome-unstable-x86_64/network-Also-work-with-NM-10.patch

----------------------------------------------------------+
 /PKGBUILD                                                |   96 +++++++++
 /gnome-control-center.install                            |   22 ++
 /network-Also-work-with-NM-10.patch                      |  126 +++++++++++++
 gnome-unstable-i686/PKGBUILD                             |   48 ----
 gnome-unstable-i686/gnome-control-center.install         |   11 -
 gnome-unstable-i686/network-Also-work-with-NM-10.patch   |   63 ------
 gnome-unstable-x86_64/PKGBUILD                           |   48 ----
 gnome-unstable-x86_64/gnome-control-center.install       |   11 -
 gnome-unstable-x86_64/network-Also-work-with-NM-10.patch |   63 ------
 9 files changed, 244 insertions(+), 244 deletions(-)

Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD	2015-03-23 11:32:31 UTC (rev 234543)
+++ gnome-unstable-i686/PKGBUILD	2015-03-23 11:32:39 UTC (rev 234544)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.15.91
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-license=(GPL)
-arch=(i686 x86_64)
-depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
-         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
-         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
-         gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus)
-makedepends=(gnome-doc-utils intltool docbook-xsl modemmanager)
-optdepends=('system-config-printer: Printer settings'
-            'gnome-user-share: Bluetooth and WebDAV file sharing'
-            'rygel: media sharing'
-            'vino: screen sharing'
-            'openssh: remote login')
-groups=(gnome)
-url="http://www.gnome.org"
-install=gnome-control-center.install
-options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('29bcd2252942f20a3e4e082cca43c2445bdf8f6244a1bc037dd57511c470b135')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/$pkgname --disable-static
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # Fix a warning
-  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
-  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}

Copied: gnome-control-center/repos/gnome-unstable-i686/PKGBUILD (from rev 234543, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD	                        (rev 0)
+++ gnome-unstable-i686/PKGBUILD	2015-03-23 11:32:39 UTC (rev 234544)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.16.0
+pkgrel=1
+pkgdesc="The Control Center for GNOME"
+license=(GPL)
+arch=(i686 x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
+         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
+         gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus)
+makedepends=(gnome-doc-utils intltool docbook-xsl modemmanager)
+optdepends=('system-config-printer: Printer settings'
+            'gnome-user-share: Bluetooth and WebDAV file sharing'
+            'rygel: media sharing'
+            'vino: screen sharing'
+            'openssh: remote login')
+groups=(gnome)
+url="http://www.gnome.org"
+install=gnome-control-center.install
+options=('!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d2ca9ef8619fee91f2b54c0b8461185ecbcb003916f5ff077ddc3f97232d3b12')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # Fix a warning
+  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}

Deleted: gnome-unstable-i686/gnome-control-center.install
===================================================================
--- gnome-unstable-i686/gnome-control-center.install	2015-03-23 11:32:31 UTC (rev 234543)
+++ gnome-unstable-i686/gnome-control-center.install	2015-03-23 11:32:39 UTC (rev 234544)
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}

Copied: gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install (from rev 234543, gnome-control-center/trunk/gnome-control-center.install)
===================================================================
--- gnome-unstable-i686/gnome-control-center.install	                        (rev 0)
+++ gnome-unstable-i686/gnome-control-center.install	2015-03-23 11:32:39 UTC (rev 234544)
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}

Deleted: gnome-unstable-i686/network-Also-work-with-NM-10.patch
===================================================================
--- gnome-unstable-i686/network-Also-work-with-NM-10.patch	2015-03-23 11:32:31 UTC (rev 234543)
+++ gnome-unstable-i686/network-Also-work-with-NM-10.patch	2015-03-23 11:32:39 UTC (rev 234544)
@@ -1,63 +0,0 @@
-From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at 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

Copied: gnome-control-center/repos/gnome-unstable-i686/network-Also-work-with-NM-10.patch (from rev 234543, gnome-control-center/trunk/network-Also-work-with-NM-10.patch)
===================================================================
--- gnome-unstable-i686/network-Also-work-with-NM-10.patch	                        (rev 0)
+++ gnome-unstable-i686/network-Also-work-with-NM-10.patch	2015-03-23 11:32:39 UTC (rev 234544)
@@ -0,0 +1,63 @@
+From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at 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

Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	2015-03-23 11:32:31 UTC (rev 234543)
+++ gnome-unstable-x86_64/PKGBUILD	2015-03-23 11:32:39 UTC (rev 234544)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.15.91
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-license=(GPL)
-arch=(i686 x86_64)
-depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
-         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
-         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
-         gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus)
-makedepends=(gnome-doc-utils intltool docbook-xsl modemmanager)
-optdepends=('system-config-printer: Printer settings'
-            'gnome-user-share: Bluetooth and WebDAV file sharing'
-            'rygel: media sharing'
-            'vino: screen sharing'
-            'openssh: remote login')
-groups=(gnome)
-url="http://www.gnome.org"
-install=gnome-control-center.install
-options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('29bcd2252942f20a3e4e082cca43c2445bdf8f6244a1bc037dd57511c470b135')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/$pkgname --disable-static
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # Fix a warning
-  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
-  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}

Copied: gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD (from rev 234543, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD	2015-03-23 11:32:39 UTC (rev 234544)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.16.0
+pkgrel=1
+pkgdesc="The Control Center for GNOME"
+license=(GPL)
+arch=(i686 x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
+         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
+         gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus)
+makedepends=(gnome-doc-utils intltool docbook-xsl modemmanager)
+optdepends=('system-config-printer: Printer settings'
+            'gnome-user-share: Bluetooth and WebDAV file sharing'
+            'rygel: media sharing'
+            'vino: screen sharing'
+            'openssh: remote login')
+groups=(gnome)
+url="http://www.gnome.org"
+install=gnome-control-center.install
+options=('!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d2ca9ef8619fee91f2b54c0b8461185ecbcb003916f5ff077ddc3f97232d3b12')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # Fix a warning
+  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}

Deleted: gnome-unstable-x86_64/gnome-control-center.install
===================================================================
--- gnome-unstable-x86_64/gnome-control-center.install	2015-03-23 11:32:31 UTC (rev 234543)
+++ gnome-unstable-x86_64/gnome-control-center.install	2015-03-23 11:32:39 UTC (rev 234544)
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}

Copied: gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install (from rev 234543, gnome-control-center/trunk/gnome-control-center.install)
===================================================================
--- gnome-unstable-x86_64/gnome-control-center.install	                        (rev 0)
+++ gnome-unstable-x86_64/gnome-control-center.install	2015-03-23 11:32:39 UTC (rev 234544)
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}

Deleted: gnome-unstable-x86_64/network-Also-work-with-NM-10.patch
===================================================================
--- gnome-unstable-x86_64/network-Also-work-with-NM-10.patch	2015-03-23 11:32:31 UTC (rev 234543)
+++ gnome-unstable-x86_64/network-Also-work-with-NM-10.patch	2015-03-23 11:32:39 UTC (rev 234544)
@@ -1,63 +0,0 @@
-From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at 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

Copied: gnome-control-center/repos/gnome-unstable-x86_64/network-Also-work-with-NM-10.patch (from rev 234543, gnome-control-center/trunk/network-Also-work-with-NM-10.patch)
===================================================================
--- gnome-unstable-x86_64/network-Also-work-with-NM-10.patch	                        (rev 0)
+++ gnome-unstable-x86_64/network-Also-work-with-NM-10.patch	2015-03-23 11:32:39 UTC (rev 234544)
@@ -0,0 +1,63 @@
+From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at 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



More information about the arch-commits mailing list