Merge lp:~robert-ancell/unity-greeter/lp-1121660 into lp:unity-greeter

[Robert Ancell]

Add visual indication of automatic login and abort when selected user changes

[Michael Terry (mterry)]

As discussed IRL, I'd prefer the countdown text to not be on the button itself.

Maybe a fake PAM info line with the phrase "You will be logged in after %d seconds"? (assuming it fits)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:759
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/~robert-ancell/unity-greeter/lp-1121660/+merge/147595/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/./label=precise/4/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/4//rebuild/?

review: Needs Fixing (continuous-integration)

Unmerged revisions

759. By Robert Ancell on 2013-02-11

Add visual indication of automatic login and abort when selected user changes

=== modified file 'src/prompt-box.vala'
--- src/prompt-box.vala	2013-01-01 20:26:59 +0000
+++ src/prompt-box.vala	2013-02-11 04:22:23 +0000
@@ -542,7 +542,7 @@
         respond (response);
     }
 
-    public void add_button (string text, string? accessible_text)
+    public DashButton add_button (string text, string? accessible_text)
     {
         var button = new DashButton (text);
 
@@ -552,6 +552,8 @@
         button.clicked.connect (button_clicked_cb);
 
         attach_item (button);
+
+        return button;
     }
 
     private void button_clicked_cb (Gtk.Button button)

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2013-01-03 15:15:54 +0000
+++ src/unity-greeter.vala	2013-02-11 04:22:23 +0000
@@ -57,7 +57,6 @@
         greeter = new LightDM.Greeter ();
         greeter.show_message.connect ((text, type) => { show_message (text, type); });
         greeter.show_prompt.connect ((text, type) => { show_prompt (text, type); });
-        greeter.autologin_timer_expired.connect (() => { greeter.authenticate_autologin (); });
         greeter.authentication_complete.connect (() => { authentication_complete (); });
         var connected = false;
         try
@@ -248,6 +247,22 @@
         return greeter.select_user_hint;
     }
 
+    public string? autologin_user_hint ()
+    {
+        if (test_mode)
+            return "autologin";
+        else
+            return greeter.autologin_user_hint;
+    }
+
+    public int autologin_timeout_hint ()
+    {
+        if (test_mode)
+            return 5;
+        else
+            return greeter.autologin_timeout_hint;
+    }
+
     public bool show_manual_login_hint ()
     {
         return greeter.show_manual_login_hint;

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-10-02 17:20:34 +0000
+++ src/user-list.vala	2013-02-11 04:22:23 +0000
@@ -51,6 +51,10 @@
     private Gdk.Pixbuf message_pixbuf;
 
     private uint change_background_timeout = 0;
+    
+    private Timer? autologin_timer = null;
+    private uint autologin_timeout = 0;
+    private DashButton? login_button = null;
 
     private uint remote_login_service_watch;
     private RemoteLoginService remote_login_service;
@@ -569,6 +573,15 @@
 
     protected override void start_authentication ()
     {
+        if (autologin_timer != null && selected_entry.id != UnityGreeter.singleton.autologin_user_hint ())
+        {
+            debug ("Cancelling autologin");
+            autologin_timer = null;
+            if (autologin_timeout != 0)
+                Source.remove (autologin_timeout);
+            autologin_timeout = 0;
+        }
+
         sensitive = true;
         greeter_authenticating_user = "";
         if (selected_entry.id.has_prefix ("*remote_directory"))
@@ -743,8 +756,16 @@
         if (successful)
         {
             /* 'Log In' here is the button for logging in. */
-            selected_entry.add_button (_("Log In"),
-                                       _("Login as %s").printf (selected_entry.label));
+            var text = _("Log In");
+            if (autologin_timer != null)
+            {
+                autologin_timer.start ();
+                var n_seconds = UnityGreeter.singleton.autologin_timeout_hint ();
+                text = ngettext ("Log In In %d Second", "Log In In %d Seconds", n_seconds).printf (n_seconds);
+            }
+
+            login_button = selected_entry.add_button (text,
+                                                      _("Login as %s").printf (selected_entry.label));
         }
         else
         {
@@ -937,11 +958,37 @@
             if (!have_entries () && !always_show_manual)
                 add_manual_entry ();
 
-            var last_user = UnityGreeter.singleton.get_state ("last-user");
+            var selected_user = UnityGreeter.singleton.get_state ("last-user");
             if (UnityGreeter.singleton.select_user_hint () != null)
-                set_active_entry (UnityGreeter.singleton.select_user_hint ());
-            else if (last_user != null)
-                set_active_entry (last_user);
+                selected_user = UnityGreeter.singleton.select_user_hint ();
+            else if (UnityGreeter.singleton.autologin_user_hint () != null)
+                selected_user = UnityGreeter.singleton.autologin_user_hint ();
+
+            if (selected_user != null)
+                set_active_entry (selected_user);
+        }
+
+        if (UnityGreeter.singleton.autologin_user_hint () == selected_entry.id)
+        {
+            autologin_timer = new Timer ();
+            autologin_timeout = Timeout.add (1000, () =>
+            {
+                var n_seconds = UnityGreeter.singleton.autologin_timeout_hint () - (int) (autologin_timer.elapsed () + 0.5);
+                if (n_seconds < 0)
+                    n_seconds = 0;
+
+                if (login_button != null)
+                    login_button.text = ngettext ("Log In In %d Second", "Log In In %d Seconds", n_seconds).printf (n_seconds);
+
+                if (n_seconds == 0)
+                {
+                    debug ("Automatically logging in");
+                    prompt_box_login_cb ();
+                    return false;
+                }
+
+                return true;
+            });
         }
     }
 
@@ -1017,6 +1064,7 @@
 
     private const TestEntry[] test_entries =
     {
+        { "autologin",          "Autologin",         "*",              "gb;us", false, false, null },
         { "has-password",       "Has Password",      "*",              "gb;us", false, false, null },
         { "different-prompt",   "Different Prompt",  "*",              "gb;us", false, false, null },
         { "no-password",        "No Password",       "*",              "gb;us", false, false, null },
@@ -1443,6 +1491,10 @@
         case "different-prompt":
             show_prompt_cb ("Secret word", LightDM.PromptType.SECRET);
             break;
+        case "autologin":
+            test_is_authenticated = true;
+            authentication_complete_cb ();
+            break;
         case "no-password":
             test_is_authenticated = true;
             authentication_complete_cb ();

=== modified file 'tests/test.vala'
--- tests/test.vala	2013-01-04 15:28:54 +0000
+++ tests/test.vala	2013-02-11 04:22:23 +0000
@@ -135,7 +135,7 @@
         // Wait until remote login appears
         scroll_to_remote_login (list);
 
-        GLib.assert (list.num_entries() == 30);
+        GLib.assert (list.num_entries() == 31);
 
         // Make sure we are at the beginning of the list
         do_scroll (list, GreeterList.ScrollTarget.START);

=== modified file 'tests/unity-greeter.vala'
--- tests/unity-greeter.vala	2013-01-03 15:15:54 +0000
+++ tests/unity-greeter.vala	2013-02-11 04:22:23 +0000
@@ -72,6 +72,16 @@
         return "";
     }
 
+    public string? autologin_user_hint ()
+    {
+        return null;
+    }
+
+    public int autologin_timeout_hint ()
+    {
+        return 0;
+    }
+
     public bool show_manual_login_hint ()
     {
         return false;