#include <nm-setting-vpn.h>
#include <nm-setting-connection.h>
#include <nm-vpn-plugin-utils.h>
+#include <nm-vpn-password-dialog.h>
#include "common/utils.h"
#include "src/nm-openvpn-service.h"
-#include "vpn-password-dialog.h"
#define KEYRING_UUID_TAG "connection-uuid"
#define KEYRING_SN_TAG "setting-name"
NMSettingSecretFlags cp_flags,
char **out_certpass)
{
- VpnPasswordDialog *dialog;
+ NMAVpnPasswordDialog *dialog;
char *prompt, *password = NULL, *certpass = NULL;
gboolean success = FALSE, need_secret = FALSE;
return TRUE;
}
- dialog = VPN_PASSWORD_DIALOG (vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL));
+ dialog = NMA_VPN_PASSWORD_DIALOG (nma_vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL));
/* pre-fill dialog with the password */
if (need_password && need_certpass) {
- vpn_password_dialog_set_show_password_secondary (dialog, TRUE);
- vpn_password_dialog_set_password_secondary_label (dialog, _("Certificate pass_word:") );
+ nma_vpn_password_dialog_set_show_password_secondary (dialog, TRUE);
+ nma_vpn_password_dialog_set_password_secondary_label (dialog, _("Certificate pass_word:") );
/* if retrying, put in the passwords from the keyring */
if (password)
- vpn_password_dialog_set_password (dialog, password);
+ nma_vpn_password_dialog_set_password (dialog, password);
if (certpass)
- vpn_password_dialog_set_password_secondary (dialog, certpass);
+ nma_vpn_password_dialog_set_password_secondary (dialog, certpass);
} else {
- vpn_password_dialog_set_show_password_secondary (dialog, FALSE);
+ nma_vpn_password_dialog_set_show_password_secondary (dialog, FALSE);
if (need_password) {
/* if retrying, put in the passwords from the keyring */
if (password)
- vpn_password_dialog_set_password (dialog, password);
+ nma_vpn_password_dialog_set_password (dialog, password);
} else if (need_certpass) {
- vpn_password_dialog_set_password_label (dialog, _("Certificate password:"));
+ nma_vpn_password_dialog_set_password_label (dialog, _("Certificate password:"));
/* if retrying, put in the passwords from the keyring */
if (certpass)
- vpn_password_dialog_set_password (dialog, certpass);
+ nma_vpn_password_dialog_set_password (dialog, certpass);
}
}
gtk_widget_show (GTK_WIDGET (dialog));
- if (vpn_password_dialog_run_and_block (dialog)) {
+ if (nma_vpn_password_dialog_run_and_block (dialog)) {
if (need_password)
- *out_password = gnome_keyring_memory_strdup (vpn_password_dialog_get_password (dialog));
+ *out_password = gnome_keyring_memory_strdup (nma_vpn_password_dialog_get_password (dialog));
if (need_certpass) {
if (need_password)
- *out_certpass = gnome_keyring_memory_strdup (vpn_password_dialog_get_password_secondary (dialog));
+ *out_certpass = gnome_keyring_memory_strdup (nma_vpn_password_dialog_get_password_secondary (dialog));
else
- *out_certpass = gnome_keyring_memory_strdup (vpn_password_dialog_get_password (dialog));
+ *out_certpass = gnome_keyring_memory_strdup (nma_vpn_password_dialog_get_password (dialog));
}
success = TRUE;
+++ /dev/null
-/* -*- 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-keyring-memory.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "vpn-password-dialog.h"
-
-G_DEFINE_TYPE (VpnPasswordDialog, vpn_password_dialog, GTK_TYPE_DIALOG)
-
-#define VPN_PASSWORD_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- VPN_TYPE_PASSWORD_DIALOG, \
- VpnPasswordDialogPrivate))
-
-typedef struct {
- /* Attributes */
- gboolean show_password;
- gboolean show_password_secondary;
-
- /* Internal widgetry and flags */
- GtkWidget *password_entry;
- GtkWidget *password_entry_secondary;
- GtkWidget *show_passwords_checkbox;
-
- GtkWidget *grid_alignment;
- GtkWidget *grid;
- GtkSizeGroup *group;
-
- char *primary_password_label;
- char *secondary_password_label;
-} VpnPasswordDialogPrivate;
-
-/* VpnPasswordDialogClass methods */
-static void vpn_password_dialog_class_init (VpnPasswordDialogClass *password_dialog_class);
-static void vpn_password_dialog_init (VpnPasswordDialog *password_dialog);
-
-/* GtkDialog callbacks */
-static void dialog_show_callback (GtkWidget *widget, gpointer callback_data);
-static void dialog_close_callback (GtkWidget *widget, gpointer callback_data);
-
-static void
-finalize (GObject *object)
-{
- VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (object);
-
- g_object_unref (priv->password_entry);
- g_object_unref (priv->password_entry_secondary);
- g_object_unref (priv->group);
-
- g_free (priv->primary_password_label);
- g_free (priv->secondary_password_label);
-
- G_OBJECT_CLASS (vpn_password_dialog_parent_class)->finalize (object);
-}
-
-static void
-vpn_password_dialog_class_init (VpnPasswordDialogClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- g_type_class_add_private (object_class, sizeof (VpnPasswordDialogPrivate));
-
- object_class->finalize = finalize;
-}
-
-static void
-vpn_password_dialog_init (VpnPasswordDialog *dialog)
-{
- VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
- priv->show_password = TRUE;
- priv->primary_password_label = g_strdup ( _("_Password:") );
- priv->show_password_secondary = TRUE;
- priv->secondary_password_label = g_strdup ( _("_Secondary Password:") );
-}
-
-/* GtkDialog callbacks */
-static void
-dialog_show_callback (GtkWidget *widget, gpointer callback_data)
-{
- VpnPasswordDialog *dialog = VPN_PASSWORD_DIALOG (callback_data);
- VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
- if (gtk_widget_get_visible (priv->password_entry))
- gtk_widget_grab_focus (priv->password_entry);
- else if (gtk_widget_get_visible (priv->password_entry_secondary))
- gtk_widget_grab_focus (priv->password_entry_secondary);
-}
-
-static void
-dialog_close_callback (GtkWidget *widget, gpointer callback_data)
-{
- gtk_widget_hide (widget);
-}
-
-static void
-add_row (GtkWidget *grid, int row, const char *label_text, GtkWidget *entry)
-{
- GtkWidget *label;
-
- label = gtk_label_new_with_mnemonic (label_text);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
- gtk_grid_attach (GTK_GRID (grid), label, 0, row, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), entry, 1, row, 1, 1);
-
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
-}
-
-static void
-remove_child (GtkWidget *child, GtkWidget *grid)
-{
- gtk_container_remove (GTK_CONTAINER (grid), child);
-}
-
-static void
-add_grid_rows (VpnPasswordDialog *dialog)
-{
- VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- int row;
- int offset = 0;
-
- gtk_alignment_set_padding (GTK_ALIGNMENT (priv->grid_alignment), 0, 0, offset, 0);
-
- /* This will not kill the entries, since they are ref:ed */
- gtk_container_foreach (GTK_CONTAINER (priv->grid), (GtkCallback) remove_child, priv->grid);
-
- row = 0;
- if (priv->show_password)
- add_row (priv->grid, row++, priv->primary_password_label, priv->password_entry);
- if (priv->show_password_secondary)
- add_row (priv->grid, row++, priv->secondary_password_label, priv->password_entry_secondary);
-
- gtk_grid_attach (GTK_GRID (priv->grid), priv->show_passwords_checkbox, 1, row, 1, 1);
-
- gtk_widget_show_all (priv->grid);
-}
-
-static void
-show_passwords_toggled_cb (GtkWidget *widget, gpointer user_data)
-{
- VpnPasswordDialog *dialog = VPN_PASSWORD_DIALOG (user_data);
- VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- gboolean visible;
-
- visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-
- gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), visible);
- gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), visible);
-}
-
-/* Public VpnPasswordDialog methods */
-GtkWidget *
-vpn_password_dialog_new (const char *title,
- const char *message,
- const char *password)
-{
- GtkWidget *dialog;
- VpnPasswordDialogPrivate *priv;
- GtkLabel *message_label;
- GtkWidget *hbox;
- GtkWidget *vbox;
- GtkWidget *main_vbox;
- GtkWidget *dialog_icon;
- GtkBox *content, *action_area;
-
- dialog = gtk_widget_new (VPN_TYPE_PASSWORD_DIALOG, NULL);
- if (!dialog)
- return NULL;
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
- gtk_window_set_title (GTK_WINDOW (dialog), title);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-
- gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
- content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
- action_area = GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog)));
-
- /* Set up the dialog */
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
- gtk_box_set_spacing (content, 2); /* 2 * 5 + 2 = 12 */
- gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
- 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);
-
- g_signal_connect (dialog, "show",
- G_CALLBACK (dialog_show_callback),
- dialog);
- g_signal_connect (dialog, "close",
- G_CALLBACK (dialog_close_callback),
- dialog);
-
- /* The grid that holds the captions */
- priv->grid_alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
-
- priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
- priv->grid = gtk_grid_new ();
- gtk_grid_set_column_spacing (GTK_GRID (priv->grid), 12);
- gtk_grid_set_row_spacing (GTK_GRID (priv->grid), 6);
- gtk_container_add (GTK_CONTAINER (priv->grid_alignment), priv->grid);
-
- priv->password_entry = gtk_entry_new ();
- priv->password_entry_secondary = gtk_entry_new ();
-
- priv->show_passwords_checkbox = gtk_check_button_new_with_mnemonic (_("Sh_ow passwords"));
-
- /* We want to hold on to these during the grid rearrangement */
- g_object_ref_sink (priv->password_entry);
- g_object_ref_sink (priv->password_entry_secondary);
- g_object_ref_sink (priv->show_passwords_checkbox);
-
- gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), FALSE);
- gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), FALSE);
-
- g_signal_connect_swapped (priv->password_entry, "activate",
- G_CALLBACK (gtk_window_activate_default),
- dialog);
- g_signal_connect_swapped (priv->password_entry_secondary, "activate",
- G_CALLBACK (gtk_window_activate_default),
- dialog);
-
- g_signal_connect (priv->show_passwords_checkbox, "toggled",
- G_CALLBACK (show_passwords_toggled_cb),
- dialog);
-
- add_grid_rows (VPN_PASSWORD_DIALOG (dialog));
-
- /* Adds some eye-candy to the dialog */
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- 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 */
- main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
-
- if (message) {
- message_label = GTK_LABEL (gtk_label_new (message));
- gtk_label_set_justify (message_label, GTK_JUSTIFY_LEFT);
- gtk_label_set_line_wrap (message_label, TRUE);
- gtk_label_set_max_width_chars (message_label, 35);
- gtk_size_group_add_widget (priv->group, GTK_WIDGET (message_label));
- gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), FALSE, FALSE, 0);
- gtk_size_group_add_widget (priv->group, priv->grid_alignment);
- }
-
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), priv->grid_alignment, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), main_vbox, 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);
-
- return GTK_WIDGET (dialog);
-}
-
-gboolean
-vpn_password_dialog_run_and_block (VpnPasswordDialog *dialog)
-{
- gint button_clicked;
-
- g_return_val_if_fail (dialog != NULL, FALSE);
- g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), FALSE);
-
- button_clicked = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_hide (GTK_WIDGET (dialog));
-
- return button_clicked == GTK_RESPONSE_OK;
-}
-
-void
-vpn_password_dialog_set_password (VpnPasswordDialog *dialog,
- const char *password)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- gtk_entry_set_text (GTK_ENTRY (priv->password_entry), password ? password : "");
-}
-
-void
-vpn_password_dialog_set_password_secondary (VpnPasswordDialog *dialog,
- const char *password_secondary)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- gtk_entry_set_text (GTK_ENTRY (priv->password_entry_secondary),
- password_secondary ? password_secondary : "");
-}
-
-void
-vpn_password_dialog_set_show_password (VpnPasswordDialog *dialog, gboolean show)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_if_fail (dialog != NULL);
- g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
- show = !!show;
- if (priv->show_password != show) {
- priv->show_password = show;
- add_grid_rows (dialog);
- }
-}
-
-void
-vpn_password_dialog_set_show_password_secondary (VpnPasswordDialog *dialog,
- gboolean show)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_if_fail (dialog != NULL);
- g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
- show = !!show;
- if (priv->show_password_secondary != show) {
- priv->show_password_secondary = show;
- add_grid_rows (dialog);
- }
-}
-
-void
-vpn_password_dialog_focus_password (VpnPasswordDialog *dialog)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_if_fail (dialog != NULL);
- g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- if (priv->show_password)
- gtk_widget_grab_focus (priv->password_entry);
-}
-
-void
-vpn_password_dialog_focus_password_secondary (VpnPasswordDialog *dialog)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_if_fail (dialog != NULL);
- g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- if (priv->show_password_secondary)
- gtk_widget_grab_focus (priv->password_entry_secondary);
-}
-
-const char *
-vpn_password_dialog_get_password (VpnPasswordDialog *dialog)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), NULL);
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- return gtk_entry_get_text (GTK_ENTRY (priv->password_entry));
-}
-
-const char *
-vpn_password_dialog_get_password_secondary (VpnPasswordDialog *dialog)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), NULL);
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- return gtk_entry_get_text (GTK_ENTRY (priv->password_entry_secondary));
-}
-
-void vpn_password_dialog_set_password_label (VpnPasswordDialog *dialog,
- const char *label)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_if_fail (dialog != NULL);
- g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
- g_free (priv->primary_password_label);
- priv->primary_password_label = g_strdup (label);
-
- if (priv->show_password)
- add_grid_rows (dialog);
-}
-
-void vpn_password_dialog_set_password_secondary_label (VpnPasswordDialog *dialog,
- const char *label)
-{
- VpnPasswordDialogPrivate *priv;
-
- g_return_if_fail (dialog != NULL);
- g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog));
-
- priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
-
- g_free (priv->secondary_password_label);
- priv->secondary_password_label = g_strdup (label);
-
- if (priv->show_password_secondary)
- add_grid_rows (dialog);
-}
-
projects / network-manager-openvpn.git / commitdiff