[network-manager-vpnc/lr/libnm: 3/10] auth-dialog: port to libnm

[Lubomir Rintel <lkundrak src gnome org>]

commit e936529c9a11caefd7371e7399685363e78d48ae
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Jul 24 19:30:15 2015 +0200

    auth-dialog: port to libnm

 auth-dialog/Makefile.am |    8 ++++----
 auth-dialog/main.c      |   11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index cb5a5c8..900e8b6 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,10 +1,10 @@
 libexec_PROGRAMS = nm-vpnc-auth-dialog
 
 nm_vpnc_auth_dialog_CPPFLAGS = \
-       $(LIBNM_GLIB_CFLAGS) \
+       $(LIBNM_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(LIBNM_GTK_CFLAGS) \
+       $(LIBNMA_CFLAGS) \
        $(LIBSECRET_CFLAGS) \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DBINDIR=\""$(bindir)"\" \
@@ -18,8 +18,8 @@ nm_vpnc_auth_dialog_SOURCES = \
 
 nm_vpnc_auth_dialog_LDADD = \
        $(GTK_LIBS) \
-       $(LIBNM_GLIB_LIBS) \
-       $(LIBNM_GTK_LIBS) \
+       $(LIBNM_LIBS) \
+       $(LIBNMA_LIBS) \
        $(LIBSECRET_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 578e53b..62b38e6 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-vpnc-service-defines.h"
 
@@ -315,7 +314,7 @@ get_pw_flags (GHashTable *hash, const char *secret_name, const char *type_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 */
@@ -478,7 +477,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;