Unity Greeter

Merge lp:~aacid/unity-greeter/new_freerdp_pam_module_strings into lp:unity-greeter

  1. new_freerdp_pam_module_strings
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Merged at revision: 526
Proposed branch: lp:~aacid/unity-greeter/new_freerdp_pam_module_strings
Merge into: lp:unity-greeter
Diff against target: 27 lines (+3/-4)
1 file modified
src/user-list.vala (+3/-4)
To merge this branch: bzr merge lp:~aacid/unity-greeter/new_freerdp_pam_module_strings
Reviewer Review Type Date Requested Status
Unity Greeter Development Team Pending
Review via email: mp+121421@code.launchpad.net

Commit message

Adapt to new names used by the new freerdp pam module

Description of the change

Adapt to new names used by the new freerdp pam module

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/user-list.vala'
2--- src/user-list.vala 2012-08-24 15:09:01 +0000
3+++ src/user-list.vala 2012-08-27 13:40:26 +0000
4@@ -955,20 +955,19 @@
5 {
6 if (selected_entry.id.has_prefix ("*remote_login"))
7 {
8- if (text == "login:")
9+ if (text == "remote login:")
10 {
11 Gtk.Entry field = current_remote_fields.get("username") as Gtk.Entry;
12 var answer = field != null ? field.text : "";
13 UnityGreeter.greeter.respond (answer);
14 }
15- // Why isn't this "password:" as the PAM module has?
16- else if (text == "Password: ")
17+ else if (text == "password:")
18 {
19 Gtk.Entry field = current_remote_fields.get("password") as Gtk.Entry;
20 var answer = field != null ? field.text : "";
21 UnityGreeter.greeter.respond (answer);
22 }
23- else if (text == "url:")
24+ else if (text == "remote host:")
25 {
26 var answer = url_from_remote_loding_server_list_name (selected_entry.id);
27 UnityGreeter.greeter.respond (answer);

Subscribers

People subscribed via source and target branches