Merge lp:~mterry/unity-greeter/two-prompts into lp:unity-greeter

[Michael Terry]

Now that lightdm itself supports multi-prompts, this branch will add support to unity-greeter.

It also fleshes out the two-prompts test user, which before didn't have a way to successfully log in.

Note that if you try and fail to log in as the two-prompts user, you will see that the error label causes the prompts to move outside the box. This is a separate bug that will be fixed by the remote-login branch. So don't worry about that. It's not caused by this branch.

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-08-16 14:58:17 +0000
+++ src/user-list.vala	2012-08-20 13:55:21 +0000
@@ -200,16 +200,16 @@
 
     protected void prompt_box_respond_cb (string[] responses)
     {
-        if (responses.length != 1)
-            return; // FIXME: handle more than 1!
-
         selected_entry.sensitive = false;
         will_clear = true;
 
-        if (UnityGreeter.test_mode)
-            test_respond (responses[0]);
-        else
-            UnityGreeter.greeter.respond (responses[0]);
+        foreach (var response in responses)
+        {
+            if (UnityGreeter.test_mode)
+                test_respond (response);
+            else
+                UnityGreeter.greeter.respond (response);
+        }
     }
 
     private void prompt_box_login_cb ()
@@ -363,6 +363,7 @@
     private List<string> test_backgrounds;
     private int n_test_entries = 0;
     private bool test_prompted_sso = false;
+    private bool test_two_prompts_first = false;
     private bool test_request_new_password = false;
     private string? test_new_password = null;
 
@@ -522,6 +523,22 @@
                 authentication_complete_cb ();
             }
             break;
+        case "two-prompts":
+            if (!test_two_prompts_first)
+            {
+                test_two_prompts_first = true;
+                if (text != "blue")
+                {
+                    test_is_authenticated = false;
+                    authentication_complete_cb ();
+                }
+            }
+            else
+            {
+                test_is_authenticated = text == "password";
+                authentication_complete_cb ();
+            }
+            break;
         case "change-password":
             if (test_new_password != null)
             {
@@ -567,6 +584,7 @@
         test_username = null;
         test_is_authenticated = false;
         test_prompted_sso = false;
+        test_two_prompts_first = false;
         test_request_new_password = false;
         test_new_password = null;
 
@@ -617,7 +635,7 @@
             show_prompt_cb (_("Password:"), LightDM.PromptType.SECRET);
             break;
         case "two-prompts":
-            show_prompt_cb (_("Favorite Color:"), LightDM.PromptType.QUESTION);
+            show_prompt_cb (_("Favorite Color (blue):"), LightDM.PromptType.QUESTION);
             show_prompt_cb (_("Password:"), LightDM.PromptType.SECRET);
             break;
         default: