[network-manager-openvpn/lr/cert-chooser: 5/6] build: bump requirement to NetworkManager 1.8

[Lubomir Rintel <lkundrak src gnome org>]

commit 5c1afa6b17212ee99ad4b38de32be76e9fcd456a
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Mar 8 15:59:25 2017 +0100

    build: bump requirement to NetworkManager 1.8

 configure.ac              |   18 +++++++++---------
 properties/auth-helpers.c |    6 +++++-
 2 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ac405c9..7ee9d3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ if test x"$with_gnome" != xno; then
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
-       PKG_CHECK_MODULES(LIBNMA, libnma >= 1.2.0)
+       PKG_CHECK_MODULES(LIBNMA, libnma >= 1.7.0)
        PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18, [], [
                dnl We use the secret service API that went stable in 0.18
                PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
@@ -106,21 +106,21 @@ if test x"$with_gnome" != xno; then
        ])
 
        if test x"$with_libnm_glib" != xno; then
-               PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.2.0)
+               PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.7.0)
                PKG_CHECK_MODULES(LIBNM_GLIB,
-                       NetworkManager >= 1.2.0
-                       libnm-util >= 1.2.0
-                       libnm-glib >= 1.2.0
-                       libnm-glib-vpn >= 1.2.0);
+                       NetworkManager >= 1.7.0
+                       libnm-util >= 1.7.0
+                       libnm-glib >= 1.7.0
+                       libnm-glib-vpn >= 1.7.0);
 
                LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
                LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
        fi
 fi
 
-PKG_CHECK_MODULES(LIBNM, libnm >= 1.2.0)
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
+PKG_CHECK_MODULES(LIBNM, libnm >= 1.7.0)
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
 
 NM_VPN_SERVICE_DIR=`$PKG_CONFIG --define-variable prefix='\${prefix}' --variable vpnservicedir libnm`
 AC_SUBST(NM_VPN_SERVICE_DIR)
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 19c5109..0964c9e 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -33,6 +33,10 @@
 #include <unistd.h>
 #include <errno.h>
 
+#ifdef NM_VPN_OLD
+#define nm_utils_is_valid_iface_name(n,e) nm_utils_iface_valid_name(n)
+#endif
+
 #include "utils.h"
 #include "nm-utils/nm-shared-utils.h"
 
@@ -1556,7 +1560,7 @@ device_name_changed_cb (GtkEntry *entry,
        entry_text = gtk_editable_get_chars (editable, 0, -1);
 
        /* Change cell's background to red if the value is invalid */
-       if (entry_sensitive && entry_text[0] != '\0' && !nm_utils_iface_valid_name (entry_text)) {
+       if (entry_sensitive && entry_text[0] != '\0' && !nm_utils_is_valid_iface_name (entry_text, NULL)) {
                widget_set_error (GTK_WIDGET (editable));
                gtk_widget_set_sensitive (ok_button, FALSE);
        } else {