[network-manager-pptp] auth-dialog: port to libsecret

[Dan Winship <danw src gnome org>]

commit 33615b8aa6f71a8e8765ee015948e9634003f887
Author: Dan Winship <danw gnome org>
Date:   Wed Feb 27 14:19:23 2013 +0100

    auth-dialog: port to libsecret
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694307

 auth-dialog/Makefile.am |    4 +-
 auth-dialog/main.c      |   64 ++++++++++++++++++++++++++++------------------
 configure.ac            |    6 ++--
 3 files changed, 44 insertions(+), 30 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 8f07b96..48f547b 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -7,7 +7,7 @@ nm_pptp_auth_dialog_CPPFLAGS =                  \
        $(GLIB_CFLAGS)                          \
        $(GTK_CFLAGS)                           \
        $(NMGTK_CFLAGS)                         \
-       $(GNOMEKEYRING_CFLAGS)                  \
+       $(LIBSECRET_CFLAGS)                     \
        -DICONDIR=\""$(datadir)/pixmaps"\"      \
        -DUIDIR=\""$(uidir)"\"                  \
        -DBINDIR=\""$(bindir)"\"                \
@@ -21,6 +21,6 @@ nm_pptp_auth_dialog_LDADD = \
        $(NM_LIBS) \
        $(GTK_LIBS) \
        $(NMGTK_LIBS) \
-       $(GNOMEKEYRING_LIBS)
+       $(LIBSECRET_LIBS)
 
 CLEANFILES = *~
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 2c04852..ba9a547 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -30,8 +30,9 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <gnome-keyring.h>
-#include <gnome-keyring-memory.h>
+
+#define SECRET_API_SUBJECT_TO_CHANGE
+#include <libsecret/secret.h>
 
 #include <nm-setting-vpn.h>
 #include <nm-vpn-plugin-utils.h>
@@ -43,34 +44,47 @@
 #define KEYRING_SN_TAG "setting-name"
 #define KEYRING_SK_TAG "setting-key"
 
+static const SecretSchema network_manager_secret_schema = {
+       "org.freedesktop.NetworkManager.Connection",
+       SECRET_SCHEMA_DONT_MATCH_NAME,
+       {
+               { KEYRING_UUID_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING },
+               { KEYRING_SN_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING },
+               { KEYRING_SK_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING },
+               { NULL, 0 },
+       }
+};
+
 #define UI_KEYFILE_GROUP "VPN Plugin UI"
 
 static char *
 keyring_lookup_secret (const char *uuid, const char *secret_name)
 {
-       GList *found_list = NULL;
-       GnomeKeyringResult ret;
-       GnomeKeyringFound *found;
+       GHashTable *attrs;
+       GList *list;
        char *secret = NULL;
 
-       ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET,
-                                             &found_list,
-                                             KEYRING_UUID_TAG,
-                                             GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
-                                             uuid,
-                                             KEYRING_SN_TAG,
-                                             GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
-                                             NM_SETTING_VPN_SETTING_NAME,
-                                             KEYRING_SK_TAG,
-                                             GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
-                                             secret_name,
-                                             NULL);
-       if (ret == GNOME_KEYRING_RESULT_OK && found_list) {
-               found = g_list_nth_data (found_list, 0);
-               secret = gnome_keyring_memory_strdup (found->secret);
+       attrs = secret_attributes_build (&network_manager_secret_schema,
+                                        KEYRING_UUID_TAG, uuid,
+                                        KEYRING_SN_TAG, NM_SETTING_VPN_SETTING_NAME,
+                                        KEYRING_SK_TAG, secret_name,
+                                        NULL);
+
+       list = secret_service_search_sync (NULL, &network_manager_secret_schema, attrs,
+                                          SECRET_SEARCH_ALL | SECRET_SEARCH_UNLOCK | 
SECRET_SEARCH_LOAD_SECRETS,
+                                          NULL, NULL);
+       if (list && list->data) {
+               SecretItem *item = list->data;
+               SecretValue *value = secret_item_get_secret (item);
+
+               if (value) {
+                       secret = g_strdup (secret_value_get (value, NULL));
+                       secret_value_unref (value);
+               }
        }
 
-       gnome_keyring_found_list_free (found_list);
+       g_list_free_full (list, g_object_unref);
+       g_hash_table_unref (attrs);
        return secret;
 }
 
@@ -124,14 +138,14 @@ get_secrets (const char *vpn_uuid,
        if (   !(pw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
            && !(pw_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)) {
                if (in_pw)
-                       pw = gnome_keyring_memory_strdup (in_pw);
+                       pw = g_strdup (in_pw);
                else
                        pw = keyring_lookup_secret (vpn_uuid, NM_PPTP_KEY_PASSWORD);
        }
 
        /* Don't ask if the passwords is unused */
        if (pw_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED) {
-               gnome_keyring_memory_free (pw);
+               g_free (pw);
                return TRUE;
        }
 
@@ -181,7 +195,7 @@ get_secrets (const char *vpn_uuid,
 
                new_password = nma_vpn_password_dialog_get_password (dialog);
                if (new_password)
-                       *out_pw = gnome_keyring_memory_strdup (new_password);
+                       *out_pw = g_strdup (new_password);
        }
 
        gtk_widget_hide (GTK_WIDGET (dialog));
@@ -277,7 +291,7 @@ main (int argc, char *argv[])
                        printf ("%s\n%s\n", NM_PPTP_KEY_PASSWORD, password);
                printf ("\n\n");
 
-               gnome_keyring_memory_free (password);
+               g_free (password);
 
                /* for good measure, flush stdout since Kansas is going Bye-Bye */
                fflush (stdout);
diff --git a/configure.ac b/configure.ac
index 4fef854..b134284 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,9 +88,9 @@ if test x"$with_gnome" != xno; then
        AC_SUBST(NMGTK_CFLAGS)
        AC_SUBST(NMGTK_LIBS)
 
-       PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
-       AC_SUBST(GNOMEKEYRING_CFLAGS)
-       AC_SUBST(GNOMEKEYRING_LIBS)
+       PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
+       AC_SUBST(LIBSECRET_CFLAGS)
+       AC_SUBST(LIBSECRET_LIBS)
 fi
 
 NM_COMPILER_WARNINGS