[network-manager-iodine: 9/14] auth-dialog: port to libnm

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

commit 01837f1c04d49dc856299e5f9961c0b5745b2b9b
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Aug 24 17:44:58 2015 +0200

    auth-dialog: port to libnm

 auth-dialog/Makefile.am |    8 ++++----
 auth-dialog/main.c      |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index b799c42..b9404c5 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -3,8 +3,8 @@ libexec_PROGRAMS = nm-iodine-auth-dialog
 nm_iodine_auth_dialog_CPPFLAGS = \
        $(GTK_CFLAGS) \
         $(LIBSECRET_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS) \
-       $(LIBNM_GTK_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(LIBNMA_CFLAGS) \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DBINDIR=\""$(bindir)"\" \
        -DG_DISABLE_DEPRECATED \
@@ -19,8 +19,8 @@ nm_iodine_auth_dialog_SOURCES = \
 
 nm_iodine_auth_dialog_LDADD = \
        $(GTK_LIBS) \
-       $(LIBNM_GLIB_LIBS) \
-       $(LIBNM_GTK_LIBS) \
+       $(LIBNM_LIBS) \
+       $(LIBNMA_LIBS) \
         $(LIBSECRET_LIBS)
 
 CLEANFILES = *~
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index d0ddc3a..56d26dc 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -34,9 +34,9 @@
 #define SECRET_API_SUBJECT_TO_CHANGE
 #include <libsecret/secret.h>
 
-#include <nm-setting-vpn.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-iodine-service-defines.h"
 
@@ -292,13 +292,13 @@ main (int argc, char *argv[])
        g_option_context_parse (context, &argc, &argv, NULL);
        g_option_context_free (context);
 
-       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;
        }
 
-       nm_vpn_plugin_utils_get_secret_flags (secrets, NM_IODINE_KEY_PASSWORD, &pw_flags);
+       nm_vpn_service_plugin_get_secret_flags (secrets, NM_IODINE_KEY_PASSWORD, &pw_flags);
 
        if (!get_secrets (vpn_uuid, vpn_name, retry, allow_interaction, external_ui_mode,
                          g_hash_table_lookup (secrets, NM_IODINE_KEY_PASSWORD),