[network-manager-fortisslvpn] auth-dialog: port to libnm



commit 8215c0e6fbe0bac0dc208750bb2e284420a6b424
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Sep 25 19:55:06 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 cb261cc..1afc3db 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,10 +1,10 @@
 libexec_PROGRAMS = nm-fortisslvpn-auth-dialog
 
 nm_fortisslvpn_auth_dialog_CPPFLAGS =          \
-       $(LIBNM_GLIB_CFLAGS)                    \
+       $(LIBNM_CFLAGS)                         \
        $(GLIB_CFLAGS)                          \
        $(GTK_CFLAGS)                           \
-       $(LIBNM_GTK_CFLAGS)                     \
+       $(LIBNMA_CFLAGS)                        \
        $(LIBSECRET_CFLAGS)                     \
        -I$(top_srcdir)                         \
        -DUIDIR=\""$(uidir)"\"                  \
@@ -14,9 +14,9 @@ nm_fortisslvpn_auth_dialog_SOURCES =          \
        main.c
 
 nm_fortisslvpn_auth_dialog_LDADD =             \
-       $(LIBNM_GLIB_LIBS)                      \
+       $(LIBNM_LIBS)                           \
        $(GTK_LIBS)                             \
-       $(LIBNM_GTK_LIBS)                       \
+       $(LIBNMA_LIBS)                          \
        $(LIBSECRET_LIBS)
 
 CLEANFILES = *~
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 92087d6..2f49600 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -33,9 +33,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-fortisslvpn-service-defines.h"
 
@@ -270,13 +270,13 @@ 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;
        }
 
-       nm_vpn_plugin_utils_get_secret_flags (secrets, NM_FORTISSLVPN_KEY_PASSWORD, &pw_flags);
+       nm_vpn_service_plugin_get_secret_flags (secrets, NM_FORTISSLVPN_KEY_PASSWORD, &pw_flags);
 
        if (!get_secrets (vpn_uuid, vpn_name, retry, allow_interaction, external_ui_mode,
                          g_hash_table_lookup (secrets, NM_FORTISSLVPN_KEY_PASSWORD),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]