[network-manager-pptp] auth-dialog: port to libnm-gtk's NMAVpnPasswordDialog

[Dan Winship <danw src gnome org>]

commit d291de33c58d8394c97d9389a677ca75468a5599
Author: Dan Winship <danw gnome org>
Date:   Tue Feb 26 14:53:04 2013 +0100

    auth-dialog: port to libnm-gtk's NMAVpnPasswordDialog
    
    https://bugzilla.gnome.org/show_bug.cgi?id=697740

 auth-dialog/Makefile.am           |    6 +-
 auth-dialog/main.c                |   14 +-
 auth-dialog/vpn-password-dialog.c |  446 -------------------------------------
 auth-dialog/vpn-password-dialog.h |   79 -------
 configure.ac                      |    4 +
 5 files changed, 14 insertions(+), 535 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 3c07050..8f07b96 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -6,6 +6,7 @@ nm_pptp_auth_dialog_CPPFLAGS =                  \
        $(NM_CFLAGS)            \
        $(GLIB_CFLAGS)                          \
        $(GTK_CFLAGS)                           \
+       $(NMGTK_CFLAGS)                         \
        $(GNOMEKEYRING_CFLAGS)                  \
        -DICONDIR=\""$(datadir)/pixmaps"\"      \
        -DUIDIR=\""$(uidir)"\"                  \
@@ -14,13 +15,12 @@ nm_pptp_auth_dialog_CPPFLAGS =                      \
        -DVERSION=\"$(VERSION)\"
 
 nm_pptp_auth_dialog_SOURCES = \
-       main.c \
-       vpn-password-dialog.c \
-       vpn-password-dialog.h
+       main.c
 
 nm_pptp_auth_dialog_LDADD = \
        $(NM_LIBS) \
        $(GTK_LIBS) \
+       $(NMGTK_LIBS) \
        $(GNOMEKEYRING_LIBS)
 
 CLEANFILES = *~
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 8a5e61d..2c04852 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -35,9 +35,9 @@
 
 #include <nm-setting-vpn.h>
 #include <nm-vpn-plugin-utils.h>
+#include <nm-vpn-password-dialog.h>
 
 #include "src/nm-pptp-service.h"
-#include "vpn-password-dialog.h"
 
 #define KEYRING_UUID_TAG "connection-uuid"
 #define KEYRING_SN_TAG "setting-name"
@@ -111,7 +111,7 @@ get_secrets (const char *vpn_uuid,
              char **out_pw,
              NMSettingSecretFlags pw_flags)
 {
-       VpnPasswordDialog *dialog;
+       NMAVpnPasswordDialog *dialog;
        char *prompt, *pw = NULL;
        const char *new_password = NULL;
 
@@ -167,19 +167,19 @@ get_secrets (const char *vpn_uuid,
        }
 
 
-       dialog = (VpnPasswordDialog *) vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL);
+       dialog = (NMAVpnPasswordDialog *) nma_vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL);
 
-       vpn_password_dialog_set_show_password_secondary (dialog, FALSE);
+       nma_vpn_password_dialog_set_show_password_secondary (dialog, FALSE);
 
        /* pre-fill dialog with the password */
        if (pw && !(pw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED))
-               vpn_password_dialog_set_password (dialog, pw);
+               nma_vpn_password_dialog_set_password (dialog, pw);
 
        gtk_widget_show (GTK_WIDGET (dialog));
 
-       if (vpn_password_dialog_run_and_block (dialog)) {
+       if (nma_vpn_password_dialog_run_and_block (dialog)) {
 
-               new_password = vpn_password_dialog_get_password (dialog);
+               new_password = nma_vpn_password_dialog_get_password (dialog);
                if (new_password)
                        *out_pw = gnome_keyring_memory_strdup (new_password);
        }
diff --git a/configure.ac b/configure.ac
index 931bbbf..4fef854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,10 @@ if test x"$with_gnome" != xno; then
        AC_SUBST(GTK_LIBS)
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
+       PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.9.0)
+       AC_SUBST(NMGTK_CFLAGS)
+       AC_SUBST(NMGTK_LIBS)
+
        PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
        AC_SUBST(GNOMEKEYRING_CFLAGS)
        AC_SUBST(GNOMEKEYRING_LIBS)