LightDM GTK Greeter

Merge lp:~olivier-martin/lightdm-gtk-greeter/password_entry-optional into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

  1. password_entry-optional
  2. Merge into trunk
Proposed by Olivier Martin
Status: Merged
Merge reported by: Andrew P.
Merged at revision: not available
Proposed branch: lp:~olivier-martin/lightdm-gtk-greeter/password_entry-optional
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 29 lines (+5/-0)
1 file modified
src/lightdm-gtk-greeter.c (+5/-0)
To merge this branch: bzr merge lp:~olivier-martin/lightdm-gtk-greeter/password_entry-optional
Reviewer Review Type Date Requested Status
LightDM Gtk+ Greeter Development Team Pending
Review via email: mp+224917@code.launchpad.net

Description of the change

process_prompts(): Do not assume password_entry should be visible

Some PAM modules might do not use password_entry for their authentification step.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lightdm-gtk-greeter.c'
2--- src/lightdm-gtk-greeter.c 2014-06-09 15:49:08 +0000
3+++ src/lightdm-gtk-greeter.c 2014-06-28 21:53:29 +0000
4@@ -1425,6 +1425,9 @@
5 gtk_widget_set_sensitive (GTK_WIDGET (username_entry), TRUE);
6 gtk_widget_set_sensitive (GTK_WIDGET (password_entry), TRUE);
7
8+ /* Do not assume a password is requested */
9+ gtk_widget_set_visible (GTK_WIDGET (password_entry), FALSE);
10+
11 /* Special case: no user selected from list, so PAM asks us for the user
12 * via a prompt. For that case, use the username field */
13 if (!prompted && pending_questions && !pending_questions->next &&
14@@ -1436,6 +1439,7 @@
15 prompted = TRUE;
16 prompt_active = TRUE;
17 gtk_widget_grab_focus (GTK_WIDGET (username_entry));
18+ gtk_widget_set_visible (GTK_WIDGET (password_entry), TRUE);
19 return;
20 }
21
22@@ -1452,6 +1456,7 @@
23 continue;
24 }
25
26+ gtk_widget_set_visible (GTK_WIDGET (password_entry), TRUE);
27 gtk_entry_set_text (password_entry, "");
28 gtk_entry_set_visibility (password_entry, message->type.prompt != LIGHTDM_PROMPT_TYPE_SECRET);
29 if (get_message_label()[0] == 0 && password_prompted)

Subscribers

People subscribed via source and target branches