Merge lp:~thad-fisch-deactivatedaccount/lightdm-gtk-greeter/preselection-fix into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Thaddaeus Tintenfisch
Status: Merged
Merged at revision: 240
Proposed branch: lp:~thad-fisch-deactivatedaccount/lightdm-gtk-greeter/preselection-fix
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 19 lines (+4/-5)
1 file modified
src/lightdm-gtk-greeter.c (+4/-5)
To merge this branch: bzr merge lp:~thad-fisch-deactivatedaccount/lightdm-gtk-greeter/preselection-fix
Reviewer Review Type Date Requested Status
Sean Davis Approve
Review via email: mp+207785@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sean Davis (bluesabre) wrote :

Wow, what a trivial fix, merging now... :-)

review: Approve

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-02-16 18:37:06 +0000
3+++ src/lightdm-gtk-greeter.c 2014-02-22 11:38:59 +0000
4@@ -1241,11 +1241,10 @@
5 set_user_image (username);
6 user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username);
7 if (user)
8- if (lightdm_user_get_logged_in (user))
9- {
10- set_language (lightdm_user_get_language (user));
11- set_session (lightdm_user_get_session (user));
12- }
13+ {
14+ set_language (lightdm_user_get_language (user));
15+ set_session (lightdm_user_get_session (user));
16+ }
17 gtk_widget_set_tooltip_text (GTK_WIDGET (user_combo), user_tooltip);
18 start_authentication (username);
19 g_free (user_tooltip);

Subscribers

People subscribed via source and target branches