applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user-accounts: Add password generation back to the password dialog

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=706067
This commit is contained in:
Ondrej Holy 2013-08-06 15:43:23 +02:00 • committed by Stef Walter
parent 12da80928e
commit a3d0840bdd
3 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
panels/user-accounts/um-password-dialog.c
View file

@ -88,6 +88,8 @@ update_password_strength (UmPasswordDialog *um)
if (strength_level > 0) { if (strength_level > 0) {
set_entry_validation_checkmark (GTK_ENTRY (um->password_entry)); set_entry_validation_checkmark (GTK_ENTRY (um->password_entry));
} else if (strlen (password) == 0) {
set_entry_generation_icon (GTK_ENTRY (um->password_entry));
} else { } else {
clear_entry_validation_error (GTK_ENTRY (um->password_entry)); clear_entry_validation_error (GTK_ENTRY (um->password_entry));
} }
@ -308,6 +310,8 @@ password_entry_changed (GtkEntry *entry,
GParamSpec *pspec, GParamSpec *pspec,
UmPasswordDialog *um) UmPasswordDialog *um)
{ {
const char *password;
if (um->password_entry_timeout_id != 0) { if (um->password_entry_timeout_id != 0) {
g_source_remove (um->password_entry_timeout_id); g_source_remove (um->password_entry_timeout_id);
um->password_entry_timeout_id = 0; um->password_entry_timeout_id = 0;
@ -317,6 +321,11 @@ password_entry_changed (GtkEntry *entry,
clear_entry_validation_error (GTK_ENTRY (um->verify_entry)); clear_entry_validation_error (GTK_ENTRY (um->verify_entry));
gtk_widget_set_sensitive (um->ok_button, FALSE); gtk_widget_set_sensitive (um->ok_button, FALSE);
password = gtk_entry_get_text (GTK_ENTRY (um->password_entry));
if (strlen (password) == 0) {
gtk_entry_set_visibility (GTK_ENTRY (um->password_entry), FALSE);
}
um->password_entry_timeout_id = g_timeout_add (PASSWORD_CHECK_TIMEOUT, um->password_entry_timeout_id = g_timeout_add (PASSWORD_CHECK_TIMEOUT,
(GSourceFunc) password_entry_timeout, (GSourceFunc) password_entry_timeout,
um); um);
@ -404,6 +413,23 @@ old_password_entry_changed (GtkEntry *entry,
um); um);
} }
static void
on_generate (GtkEntry *entry,
GtkEntryIconPosition pos,
GdkEventButton *event,
UmPasswordDialog *um)
{
gchar *pwd;
pwd = pw_generate ();
gtk_entry_set_text (GTK_ENTRY (um->password_entry), pwd);
gtk_entry_set_text (GTK_ENTRY (um->verify_entry), pwd);
gtk_entry_set_visibility (GTK_ENTRY (um->password_entry), TRUE);
g_free (pwd);
}
UmPasswordDialog * UmPasswordDialog *
um_password_dialog_new (void) um_password_dialog_new (void)
{ {
@ -454,6 +480,7 @@ um_password_dialog_new (void)
g_signal_connect_swapped (widget, "activate", G_CALLBACK (password_entry_timeout), um); g_signal_connect_swapped (widget, "activate", G_CALLBACK (password_entry_timeout), um);
gtk_entry_set_visibility (GTK_ENTRY (widget), FALSE); gtk_entry_set_visibility (GTK_ENTRY (widget), FALSE);
um->password_entry = widget; um->password_entry = widget;
g_signal_connect (widget, "icon-press", G_CALLBACK (on_generate), um);
widget = (GtkWidget *) gtk_builder_get_object (builder, "old-password-entry"); widget = (GtkWidget *) gtk_builder_get_object (builder, "old-password-entry");
g_signal_connect_after (widget, "focus-out-event", g_signal_connect_after (widget, "focus-out-event",
@ -523,6 +550,9 @@ um_password_dialog_set_user (UmPasswordDialog *um,
gtk_entry_set_text (GTK_ENTRY (um->verify_entry), ""); gtk_entry_set_text (GTK_ENTRY (um->verify_entry), "");
gtk_entry_set_text (GTK_ENTRY (um->old_password_entry), ""); gtk_entry_set_text (GTK_ENTRY (um->old_password_entry), "");
gtk_entry_set_visibility (GTK_ENTRY (um->password_entry), FALSE);
gtk_entry_set_visibility (GTK_ENTRY (um->verify_entry), FALSE);
if (act_user_get_uid (um->user) == getuid ()) { if (act_user_get_uid (um->user) == getuid ()) {
mode_change (um, ACT_USER_PASSWORD_MODE_REGULAR); mode_change (um, ACT_USER_PASSWORD_MODE_REGULAR);
gtk_widget_hide (um->action_radio_box); gtk_widget_hide (um->action_radio_box);

8
panels/user-accounts/um-utils.c
View file

@ -300,6 +300,14 @@ set_entry_validation_error (GtkEntry *entry,
text); text);
} }
void
set_entry_generation_icon (GtkEntry *entry)
{
g_object_set (entry, "caps-lock-warning", FALSE, NULL);
gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, "system-run-symbolic");
gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, TRUE);
}
void void
set_entry_validation_checkmark (GtkEntry *entry) set_entry_validation_checkmark (GtkEntry *entry)
{ {

1
panels/user-accounts/um-utils.h
View file

@ -40,6 +40,7 @@ void setup_tooltip_with_embedded_icon (GtkWidget *widget,
gboolean show_tooltip_now (GtkWidget *widget, gboolean show_tooltip_now (GtkWidget *widget,
GdkEvent *event); GdkEvent *event);
void set_entry_generation_icon (GtkEntry *entry);
void set_entry_validation_checkmark (GtkEntry *entry); void set_entry_validation_checkmark (GtkEntry *entry);
void set_entry_validation_error (GtkEntry *entry, void set_entry_validation_error (GtkEntry *entry,
const gchar *text); const gchar *text);