[network-manager-openswan/lr/libnm: 6/10] auth-dialog: port to libnm

[Lubomir Rintel <lkundrak src gnome org>]

commit 79c33dfbeb2055ed6648cdff450df61d0be35def
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Jul 24 19:07:37 2015 +0200

    auth-dialog: port to libnm

 auth-dialog/Makefile.am |    8 ++++----
 auth-dialog/main.c      |   11 +++++------
 configure.ac            |    1 +
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 9475cc9..b5d3563 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,8 +1,8 @@
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(LIBNMA_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(LIBNM_GTK_CFLAGS) \
        $(LIBSECRET_CFLAGS) \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DBINDIR=\""$(bindir)"\" \
@@ -15,9 +15,9 @@ libexec_PROGRAMS = nm-openswan-auth-dialog
 nm_openswan_auth_dialog_SOURCES = main.c
 
 nm_openswan_auth_dialog_LDADD = \
-       $(LIBNM_GLIB_LIBS) \
+       $(LIBNM_LIBS) \
        $(GTK_LIBS) \
-       $(LIBNM_GTK_LIBS) \
+       $(LIBNMA_LIBS) \
        $(LIBSECRET_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 189d5ba..7d07b8a 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -33,10 +33,9 @@
 #define SECRET_API_SUBJECT_TO_CHANGE
 #include <libsecret/secret.h>
 
-#include <nm-setting-vpn.h>
-#include <nm-setting-connection.h>
-#include <nm-vpn-plugin-utils.h>
-#include <nm-vpn-password-dialog.h>
+#include <NetworkManager.h>
+#include <nm-vpn-service-plugin.h>
+#include <nma-vpn-password-dialog.h>
 
 #include <../src/nm-openswan-service.h>
 
@@ -319,7 +318,7 @@ get_pw_flags (GHashTable *hash, const char *secret_name, const char *mode_name)
        NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
 
        /* Try new flags value first */
-       if (nm_vpn_plugin_utils_get_secret_flags (hash, secret_name, &flags))
+       if (nm_vpn_service_plugin_get_secret_flags (hash, secret_name, &flags))
                return flags;
 
        /* Otherwise try old "password type" value */
@@ -473,7 +472,7 @@ main (int argc, char *argv[])
                return 1;
        }
 
-       if (!nm_vpn_plugin_utils_read_vpn_details (0, &data, &secrets)) {
+       if (!nm_vpn_service_plugin_read_vpn_details (0, &data, &secrets)) {
                fprintf (stderr, "Failed to read '%s' (%s) data and secrets from stdin.\n",
                         vpn_name, vpn_uuid);
                return 1;
diff --git a/configure.ac b/configure.ac
index 700e4c6..2cfe669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,7 @@ if test x"$with_gnome" != xno; then
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
        PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.1.0)
+       PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
 
        PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
 fi