Merge lp:~ssweeny/unity-greeter/remote-login-no-email into lp:unity-greeter

[Scott Sweeny]

Allow either username or email for remote login (LP: #1172877)

This change removes the strict requirement of an email address from remote login and allows the process to go forward with a user name as well.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1150
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ssweeny/unity-greeter/remote-login-no-email/+merge/215053/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/46/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1150
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/47/rebuild

review: Approve (continuous-integration)

Unmerged revisions

1150. By Scott Sweeny on 2014-04-09

Merge from commercial repo (LP: #1172877)

1149. By Scott Sweeny on 2014-04-09

Merge from upstream

1148. By Scott Sweeny on 2014-03-28

Merge from trunk

1147. By Scott Sweeny on 2014-03-28

Merge from commercial repo

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-08 03:58:58 +0000
+++ debian/changelog	2014-04-09 22:30:33 +0000
@@ -1,3 +1,9 @@
+unity-greeter (14.04.9-0ubuntu2) trusty; urgency=low
+
+  * Merge from commercial repo (LP: #1172877)
+
+ -- Scott Sweeny <[e-mail]>  Fri, 28 Mar 2014 00:46:45 -0400
+
 unity-greeter (14.04.9-0ubuntu1) trusty; urgency=medium
 
   * New upstream release:

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2014-03-26 21:25:01 +0000
+++ src/user-list.vala	2014-04-09 22:30:33 +0000
@@ -402,20 +402,24 @@
 
         var password_field = current_remote_fields.get ("password") as DashEntry;
         var email_field = current_remote_fields.get ("email") as Gtk.Entry;
+        var username_field = current_remote_fields.get ("username") as Gtk.Entry;
         if (password_field == null)
         {
             debug ("Something wrong happened in remote_directory_respond_cb. There was no password field");
             return;
         }
-        if (email_field == null)
+        if (email_field == null && username_field == null)
         {
-            debug ("Something wrong happened in remote_directory_respond_cb. There was no email field");
+            debug ("Something wrong happened in remote_directory_respond_cb. There was no email or username field");
             return;
         }
 
         RemoteServer[] server_list = {};
-        var email = email_field.text;
-        var email_valid = false;
+        var email = (email_field == null) ? username_field.text : email_field.text;
+        var email_valid = (email_field == null) ? true : false;
+
+        if (! email_valid) {
+
         try
         {
             /* Check email address is valid
@@ -431,6 +435,8 @@
             debug ("Calling email regex match failed. Error: %s", e.message);
         }
 
+        } /* (! email_valid) */
+
         selected_entry.reset_messages ();
         if (!email_valid)
         {
@@ -497,8 +503,7 @@
                 password_field.did_respond = false;
                 if (server_list.length == 0)
                     show_remote_account_dialog ();
-                else
-                {
+                else {
                     var last_used_server_list_name = "";
                     foreach (var remote_server in server_list)
                     {
@@ -510,6 +515,15 @@
                         set_active_entry (last_used_server_list_name);
                     else
                         set_active_first_entry_with_prefix ("*remote_login");
+
+                }
+                if (server_list.length == 1) {
+                    var remote_server = server_list[0];
+                    if (is_supported_remote_session (remote_server.type)) {
+                        debug ("pass-thru shortcut");
+                        set_active_first_entry_with_prefix ("*remote_login");
+                        selected_entry.respond ({});
+                    }
                 }
             }
             else