[krb5-auth-dialog] Use libnm only

[Guido Günther <guidog src gnome org>]

commit 14d7a8ca50e1b55178637c4d02e9f419295f72ce
Author: Guido Günther <agx sigxcpu org>
Date:   Sat Jan 14 19:16:21 2017 +0100

    Use libnm only
    
    Requires network-manager 1.0 released December 2014.

 configure.ac      |    4 +---
 src/ka-kerberos.c |   24 +-----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1e1a6aa..fc9248a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,9 +149,7 @@ if test "x$enable_network_manager" != "xno"; then
        PKG_CHECK_MODULES([NETWORK_MANAGER],[libnm],
                AC_DEFINE([HAVE_LIBNM],[1],[Define if libnm is available])
                [enable_network_manager=yes],
-               PKG_CHECK_MODULES([NETWORK_MANAGER],[libnm-glib >= 0.7.999],
-                       [enable_network_manager=yes],
-                       [enable_network_manager=no]))
+               [enable_network_manager=no])
        AC_SUBST([NETWORK_MANAGER_CFLAGS])
        AC_SUBST([NETWORK_MANAGER_LIBS])
 fi
diff --git a/src/ka-kerberos.c b/src/ka-kerberos.c
index 373d9ae..c2ec617 100644
--- a/src/ka-kerberos.c
+++ b/src/ka-kerberos.c
@@ -41,14 +41,7 @@
 #include "ka-main-window.h"
 
 #ifdef ENABLE_NETWORK_MANAGER
-#  ifdef HAVE_LIBNM
-#    include <NetworkManager.h>
-#  else
-#    include <nm-client.h>
-#    if !defined(NM_CHECK_VERSION)
-#      define NM_CHECK_VERSION(x,y,z) 0
-#    endif
-#  endif
+# include <NetworkManager.h>
 #endif
 
 #ifdef HAVE_HX509_ERR_H
@@ -504,20 +497,14 @@ ka_nm_client_state_changed_cb (NMClient * client,
         KA_DEBUG ("Network state: %d", state);
         /* do nothing */
         break;
-#if NM_CHECK_VERSION(0,8,992)
     case NM_STATE_DISCONNECTING:
-#endif
     case NM_STATE_DISCONNECTED:
         KA_DEBUG ("Network disconnected");
         *online = FALSE;
         break;
-#if NM_CHECK_VERSION(0,8,992)
     case NM_STATE_CONNECTED_LOCAL:
     case NM_STATE_CONNECTED_SITE:
     case NM_STATE_CONNECTED_GLOBAL:
-#else
-    case NM_STATE_CONNECTED:
-#endif
         KA_DEBUG ("Network connected");
         *online = TRUE;
         break;
@@ -1097,7 +1084,6 @@ static gboolean
 ka_nm_init (void)
 {
 #ifdef ENABLE_NETWORK_MANAGER
-#ifdef HAVE_LIBNM
     GError *error = NULL;
 
     nm_client = nm_client_new (NULL, &error);
@@ -1106,14 +1092,6 @@ ka_nm_init (void)
         g_error_free (error);
         return FALSE;
     }
-#else
-    nm_client = nm_client_new ();
-    if (!nm_client) {
-        g_warning ("Could not initialize nm-client");
-        return FALSE;
-    }
-#endif
-
     g_signal_connect (nm_client, "notify::state",
                       G_CALLBACK (ka_nm_client_state_changed_cb),
                       &is_online);