[network-manager-openswan] auth-dialog: simplify keyring access and don't save secrets

From: Dan Williams <dcbw src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-openswan] auth-dialog: simplify keyring access and don't save secrets
Date: Mon, 18 Jul 2011 20:32:50 +0000 (UTC)
commit b1f470cd857745d2ef34b6937ee5fc2cfc131310
Author: Dan Williams <dcbw redhat com>
Date:   Mon Jul 18 13:24:15 2011 -0500

    auth-dialog: simplify keyring access and don't save secrets
    
    Secrets are saved by the agent (ie, nm-applet) and that means we're
    only using one keyring function here, so fold that keyring bit
    into the auth dialog since nobody else uses it.
    
    Update/simplify the password dialog at the same time.

 auth-dialog/Makefile.am                            |    8 +-
 auth-dialog/main.c                                 |   90 ++++++-----
 ...two-password-dialog.c => vpn-password-dialog.c} |  165 ++++++--------------
 ...two-password-dialog.h => vpn-password-dialog.h} |   61 +++-----
 po/POTFILES.in                                     |    2 +-
 5 files changed, 126 insertions(+), 200 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 3652a27..209553b 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -4,7 +4,6 @@ libexec_PROGRAMS = nm-openswan-auth-dialog
 
 nm_openswan_auth_dialog_CPPFLAGS = \
 	$(NM_CFLAGS) \
-	$(GTHREAD_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
 	-DICONDIR=\""$(datadir)/pixmaps"\" \
@@ -17,12 +16,13 @@ nm_openswan_auth_dialog_CPPFLAGS = \
 
 nm_openswan_auth_dialog_SOURCES = \
 	main.c \
-	gnome-two-password-dialog.c \
-	gnome-two-password-dialog.h
+	vpn-password-dialog.c \
+	vpn-password-dialog.h
 
 nm_openswan_auth_dialog_LDADD = \
+	$(NM_LIBS) \
 	$(GTK_LIBS) \
-	$(top_builddir)/common-gnome/libnm-openswan-common-gnome.la
+	$(GNOMEKEYRING_LIBS)
 
 CLEANFILES = *~
 
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 59b61d1..8a08150 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -36,9 +36,41 @@
 #include <nm-setting-connection.h>
 #include <nm-vpn-plugin-utils.h>
 
-#include "common-gnome/keyring-helpers.h"
 #include "src/nm-openswan-service.h"
-#include "gnome-two-password-dialog.h"
+#include "vpn-password-dialog.h"
+
+#define KEYRING_UUID_TAG "connection-uuid"
+#define KEYRING_SN_TAG "setting-name"
+#define KEYRING_SK_TAG "setting-key"
+
+static char *
+keyring_lookup_secret (const char *uuid, const char *secret_name)
+{
+	GList *found_list = NULL;
+	GnomeKeyringResult ret;
+	GnomeKeyringFound *found;
+	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);
+	}
+
+	gnome_keyring_found_list_free (found_list);
+	return secret;
+}
 
 static gboolean
 get_secrets (const char *vpn_uuid,
@@ -69,7 +101,11 @@ get_secrets (const char *vpn_uuid,
 		if (in_upw)
 			upw = gnome_keyring_memory_strdup (in_upw);
 		else
-			keyring_helpers_get_one_secret (vpn_uuid, OPENSWAN_USER_PASSWORD, &upw);
+			upw = keyring_lookup_secret (vpn_uuid, NM_OPENSWAN_XAUTH_PASSWORD);
+
+		/* Try the old name */
+		if (upw == NULL)
+			upw = keyring_lookup_secret (vpn_uuid, "password");
 	}
 
 	if (   !(gpw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
@@ -77,7 +113,11 @@ get_secrets (const char *vpn_uuid,
 		if (in_gpw)
 			gpw = gnome_keyring_memory_strdup (in_gpw);
 		else
-			keyring_helpers_get_one_secret (vpn_uuid, OPENSWAN_GROUP_PASSWORD, &gpw);
+			gpw = keyring_lookup_secret (vpn_uuid, NM_OPENSWAN_PSK_VALUE);
+
+		/* Try the old name */
+		if (gpw == NULL)
+			gpw = keyring_lookup_secret (vpn_uuid, "group-password");
 	}
 
 	if (!retry) {
@@ -114,7 +154,6 @@ get_secrets (const char *vpn_uuid,
 	dialog = VPN_PASSWORD_DIALOG (vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL));
 	g_free (prompt);
 
-	vpn_password_dialog_set_show_remember (dialog, FALSE);
 	vpn_password_dialog_set_password_secondary_label (dialog, _("_Group Password:"));
 
 	/* Don't show the user password entry if the user password isn't required,
@@ -139,16 +178,13 @@ get_secrets (const char *vpn_uuid,
 	}
 
 	/* if retrying, pre-fill dialog with the password */
-	if (upw) {
+	if (upw)
 		vpn_password_dialog_set_password (dialog, upw);
-		memset (upw, 0, strlen (upw));
-		gnome_keyring_memory_free (upw);
-	}
-	if (gpw) {
+	gnome_keyring_memory_free (upw);
+
+	if (gpw)
 		vpn_password_dialog_set_password_secondary (dialog, gpw);
-		memset (gpw, 0, strlen (gpw));
-		gnome_keyring_memory_free (gpw);
-	}
+	gnome_keyring_memory_free (gpw);
 
 	gtk_widget_show (GTK_WIDGET (dialog));
 
@@ -157,24 +193,6 @@ get_secrets (const char *vpn_uuid,
 	if (success) {
 		*out_upw = gnome_keyring_memory_strdup (vpn_password_dialog_get_password (dialog));
 		*out_gpw = gnome_keyring_memory_strdup (vpn_password_dialog_get_password_secondary (dialog));
-
-		if (upw_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED) {
-		    if (*out_upw && !(upw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED))
-				keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, OPENSWAN_USER_PASSWORD, *out_upw);
-			else {
-				/* Clear the password from the keyring */
-				keyring_helpers_delete_secret (vpn_uuid, OPENSWAN_USER_PASSWORD);
-			}
-		}
-
-		if (gpw_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED) {
-		    if (*out_gpw && !(gpw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED))
-				keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, OPENSWAN_GROUP_PASSWORD, *out_gpw);
-			else {
-				/* Clear the password from the keyring */
-				keyring_helpers_delete_secret (vpn_uuid, OPENSWAN_GROUP_PASSWORD);
-			}
-		}
 	}
 
 	gtk_widget_hide (GTK_WIDGET (dialog));
@@ -303,14 +321,8 @@ main (int argc, char *argv[])
 		printf ("%s\n%s\n", NM_OPENSWAN_PSK_VALUE, group_password);
 	printf ("\n\n");
 
-	if (password) {
-		memset (password, 0, strlen (password));
-		gnome_keyring_memory_free (password);
-	}
-	if (group_password) {
-		memset (group_password, 0, strlen (group_password));
-		gnome_keyring_memory_free (group_password);
-	}
+	gnome_keyring_memory_free (password);
+	gnome_keyring_memory_free (group_password);
 
 	/* for good measure, flush stdout since Kansas is going Bye-Bye */
 	fflush (stdout);
diff --git a/auth-dialog/gnome-two-password-dialog.c b/auth-dialog/vpn-password-dialog.c
similarity index 74%
rename from auth-dialog/gnome-two-password-dialog.c
rename to auth-dialog/vpn-password-dialog.c
index 6ddda93..9fa2509 100644
--- a/auth-dialog/gnome-two-password-dialog.c
+++ b/auth-dialog/vpn-password-dialog.c
@@ -1,35 +1,34 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* gnome-password-dialog.c - A use password prompting dialog widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the ree Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Authors: Ramiro Estrugo <ramiro eazel com>
-*/
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* vpn-password-dialog.c - A use password prompting dialog widget.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 1999, 2000 Eazel, Inc.
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * Authors: Ramiro Estrugo <ramiro eazel com>
+ *          Dan Williams <dcbw redhat com>
+ */
 
 #include <config.h>
-#include "gnome-two-password-dialog.h"
+#include "vpn-password-dialog.h"
 #include <gnome-keyring-memory.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "src/nm-openswan-service.h"
-
 G_DEFINE_TYPE (VpnPasswordDialog, vpn_password_dialog, GTK_TYPE_DIALOG)
 
 #define VPN_PASSWORD_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
@@ -40,10 +39,6 @@ typedef struct {
 	/* Attributes */
 	gboolean show_password;
 	gboolean show_password_secondary;
-	
-	/* TODO: */
-	gboolean remember;
-	char *remember_label_text;
 
 	/* Internal widgetry and flags */
 	GtkWidget *password_entry;
@@ -53,9 +48,6 @@ typedef struct {
 	GtkWidget *table_alignment;
 	GtkWidget *table;
 	GtkSizeGroup *group;
-	
-	GtkWidget *remember_session_button;
-	GtkWidget *remember_forever_button;
 
 	char *secondary_password_label;
 } VpnPasswordDialogPrivate;
@@ -77,7 +69,6 @@ finalize (GObject *object)
 	g_object_unref (priv->password_entry_secondary);
 	g_object_unref (priv->group);
 
-	g_free (priv->remember_label_text);
 	g_free (priv->secondary_password_label);
 
 	G_OBJECT_CLASS (vpn_password_dialog_parent_class)->finalize (object);
@@ -191,8 +182,7 @@ vpn_password_dialog_new (const char *title,
 	GtkWidget *vbox;
 	GtkWidget *main_vbox;
 	GtkWidget *dialog_icon;
-	GtkWidget *content_area;
-	GtkWidget *action_area;
+	GtkBox *content, *action_area;
 
 	dialog = gtk_widget_new (VPN_TYPE_PASSWORD_DIALOG, NULL);
 	if (!dialog)
@@ -208,14 +198,17 @@ vpn_password_dialog_new (const char *title,
 	                        NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
-	/* Setup the dialog */
-	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-	action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+	content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
+	action_area = GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog)));
 
+	/* Setup the dialog */
+#if !GTK_CHECK_VERSION (2,22,0)
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+#endif
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-	gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
+	gtk_box_set_spacing (content, 2); /* 2 * 5 + 2 = 12 */
 	gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
-	gtk_box_set_spacing (GTK_BOX (action_area), 6);
+	gtk_box_set_spacing (action_area, 6);
 
  	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
@@ -243,20 +236,9 @@ vpn_password_dialog_new (const char *title,
 	priv->show_passwords_checkbox = gtk_check_button_new_with_mnemonic (_("Sh_ow passwords"));
 
 	/* We want to hold on to these during the table rearrangement */
-#if GLIB_CHECK_VERSION (2, 10, 0)
 	g_object_ref_sink (priv->password_entry);
 	g_object_ref_sink (priv->password_entry_secondary);
 	g_object_ref_sink (priv->show_passwords_checkbox);
-#else
-	g_object_ref (priv->password_entry);
-	gtk_object_sink (GTK_OBJECT (priv->password_entry));
-
-	g_object_ref (priv->password_entry_secondary);
-	gtk_object_sink (GTK_OBJECT (priv->password_entry_secondary));
-
-	g_object_ref (priv->show_passwords_checkbox);
-	gtk_object_sink (GTK_OBJECT (priv->show_passwords_checkbox));
-#endif
 	
 	gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), FALSE);
 	gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), FALSE);
@@ -275,14 +257,22 @@ vpn_password_dialog_new (const char *title,
 	add_table_rows (VPN_PASSWORD_DIALOG (dialog));
 
 	/* Adds some eye-candy to the dialog */
+#if GTK_CHECK_VERSION (3,1,6)
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+#else
 	hbox = gtk_hbox_new (FALSE, 12);
+#endif
  	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
 	dialog_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG);
 	gtk_misc_set_alignment (GTK_MISC (dialog_icon), 0.5, 0.0);
 	gtk_box_pack_start (GTK_BOX (hbox), dialog_icon, FALSE, FALSE, 0);
 
 	/* Fills the vbox */
+#if GTK_CHECK_VERSION (3,1,6)
+	main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
+#else
 	main_vbox = gtk_vbox_new (FALSE, 18);
+#endif
 
 	if (message) {
 		message_label = GTK_LABEL (gtk_label_new (message));
@@ -293,18 +283,16 @@ vpn_password_dialog_new (const char *title,
 		gtk_size_group_add_widget (priv->group, priv->table_alignment);
 	}
 
+#if GTK_CHECK_VERSION (3,1,6)
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+#else
 	vbox = gtk_vbox_new (FALSE, 6);
+#endif
 	gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->table_alignment, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), main_vbox, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
-	gtk_widget_show_all (content_area);
-
-	priv->remember_session_button = gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session"));
-	priv->remember_forever_button = gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring"));
-
-	gtk_box_pack_start (GTK_BOX (vbox), priv->remember_session_button, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), priv->remember_forever_button, FALSE, FALSE, 0);
+	gtk_box_pack_start (content, hbox, FALSE, FALSE, 0);
+	gtk_widget_show_all (GTK_WIDGET (content));
 
 	vpn_password_dialog_set_password (VPN_PASSWORD_DIALOG (dialog), password);
 	
@@ -433,65 +421,6 @@ vpn_password_dialog_get_password_secondary (VpnPasswordDialog *dialog)
 	return gtk_entry_get_text (GTK_ENTRY (priv->password_entry_secondary));
 }
 
-void
-vpn_password_dialog_set_show_remember (VpnPasswordDialog *dialog,
-                                       gboolean show_remember)
-{
-	VpnPasswordDialogPrivate *priv;
-
-	g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
-	priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-	if (show_remember) {
-		gtk_widget_show (priv->remember_session_button);
-		gtk_widget_show (priv->remember_forever_button);
-	} else {
-		gtk_widget_hide (priv->remember_session_button);
-		gtk_widget_hide (priv->remember_forever_button);
-	}
-}
-
-void
-vpn_password_dialog_set_remember (VpnPasswordDialog *dialog,
-                                  VpnPasswordRemember remember)
-{
-	VpnPasswordDialogPrivate *priv;
-	gboolean session = FALSE, forever = FALSE;
-
-	g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
-	priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
-	if (remember == VPN_PASSWORD_REMEMBER_SESSION)
-		session = TRUE;
-	else if (remember == VPN_PASSWORD_REMEMBER_FOREVER)
-		forever = TRUE;
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->remember_session_button), session);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->remember_forever_button), forever);
-}
-
-VpnPasswordRemember
-vpn_password_dialog_get_remember (VpnPasswordDialog *dialog)
-{
-	VpnPasswordDialogPrivate *priv;
-	gboolean session, forever;
-
-	g_return_val_if_fail (dialog != NULL, VPN_PASSWORD_REMEMBER_NOTHING);
-	g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), VPN_PASSWORD_REMEMBER_NOTHING);
-
-	priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
-	session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->remember_session_button));
-	forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->remember_forever_button));
-	if (forever)
-		return VPN_PASSWORD_REMEMBER_FOREVER;
-	else if (session)
-		return VPN_PASSWORD_REMEMBER_SESSION;
-
-	return VPN_PASSWORD_REMEMBER_NOTHING;
-}
-
 void vpn_password_dialog_set_password_secondary_label (VpnPasswordDialog *dialog,
                                                        const char *label)
 {
diff --git a/auth-dialog/gnome-two-password-dialog.h b/auth-dialog/vpn-password-dialog.h
similarity index 60%
rename from auth-dialog/gnome-two-password-dialog.h
rename to auth-dialog/vpn-password-dialog.h
index 28109fb..d4b4099 100644
--- a/auth-dialog/gnome-two-password-dialog.h
+++ b/auth-dialog/vpn-password-dialog.h
@@ -1,28 +1,26 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* gnome-two-password-dialog.h - A use password prompting dialog widget
-                                 asking for two passwords. Based of
-                                 gnome-password-dialog.[ch] from libgnomeui
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-   Copyright (C) 2005, Red Hat, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Authors: Ramiro Estrugo <ramiro eazel com>
-*/
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* vpn-password-dialog.c - A use password prompting dialog widget.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 1999, 2000 Eazel, Inc.
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * Authors: Ramiro Estrugo <ramiro eazel com>
+ *          Dan Williams <dcbw redhat com>
+ */
 
 #ifndef VPN_PASSWORD_DIALOG_H
 #define VPN_PASSWORD_DIALOG_H
@@ -48,12 +46,6 @@ struct VpnPasswordDialogClass {
 	GtkDialogClass parent_class;
 };
 
-typedef enum {
-	VPN_PASSWORD_REMEMBER_NOTHING,
-	VPN_PASSWORD_REMEMBER_SESSION,
-	VPN_PASSWORD_REMEMBER_FOREVER
-} VpnPasswordRemember;
-
 
 GType      vpn_password_dialog_get_type              (void);
 GtkWidget* vpn_password_dialog_new                   (const char *title,
@@ -76,13 +68,6 @@ void vpn_password_dialog_set_password_secondary       (VpnPasswordDialog *dialog
                                                        const char *password_secondary);
 void vpn_password_dialog_set_password_secondary_label (VpnPasswordDialog *dialog,
                                                        const char *label);
-
-void vpn_password_dialog_set_show_remember            (VpnPasswordDialog *dialog,
-                                                       gboolean show_remember);
-void vpn_password_dialog_set_remember                 (VpnPasswordDialog *dialog,
-                                                       VpnPasswordRemember remember);
-VpnPasswordRemember vpn_password_dialog_get_remember  (VpnPasswordDialog *dialog);
-
 /* Attribute accessors */
 const char *vpn_password_dialog_get_password                (VpnPasswordDialog *dialog);
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ab7963f..5a1ff35 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-auth-dialog/gnome-two-password-dialog.c
+auth-dialog/vpn-password-dialog.c
 auth-dialog/main.c
 nm-openswan.desktop.in
 properties/nm-openswan.c
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]