Merge lp:~robert-ancell/unity-greeter/bug-844044 into lp:unity-greeter

[Robert Ancell]

Requires lightdm 1.1.7

[lp:~robert-ancell/unity-greeter/bug-844044]

343. By Robert Ancell on 2012-03-09

Depend on correct version of liblightdm-gobject-1

[Michael Terry (mterry)]

Looks good.

review: Approve

=== modified file 'NEWS'
--- NEWS	2012-03-08 04:15:45 +0000
+++ NEWS	2012-03-09 04:48:17 +0000
@@ -4,6 +4,7 @@
     * Show manual entry when no users available
     * Fix prompt entry text not showing in some themes
     * Fix Orca command line so it works with version 3.3.90+
+    * Show manual login option if hint is present
 
 Overview of changes in unity-greeter 0.2.4
 

=== modified file 'configure.ac'
--- configure.ac	2012-02-23 13:35:53 +0000
+++ configure.ac	2012-03-09 04:48:17 +0000
@@ -22,7 +22,7 @@
     gtk+-3.0
     gdk-x11-3.0
     indicator3-0.4
-    liblightdm-gobject-1 >= 1.1.3
+    liblightdm-gobject-1 >= 1.1.7
     freetype2
     cairo-ft
     libcanberra

=== modified file 'src/fixes.vapi'
--- src/fixes.vapi	2012-03-07 04:52:42 +0000
+++ src/fixes.vapi	2012-03-09 04:48:17 +0000
@@ -28,8 +28,10 @@
     public const int KEY_0;
     public const int KEY_g;
     public const int KEY_G;
+    public const int KEY_h;
+    public const int KEY_m;
+    public const int KEY_M;
     public const int KEY_s;
-    public const int KEY_h;
     public const int KEY_plus;
     public const int KEY_minus;
     public const int KEY_equal;

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-03-08 03:15:53 +0000
+++ src/unity-greeter.vala	2012-03-09 04:48:17 +0000
@@ -153,7 +153,7 @@
             }
 
             while (add_test_entry ());
-            user_list.add_entry ("*guest", _("Guest Session"));
+            user_list.offer_guest = true;
             
             main_window.key_press_event.connect (key_press_cb);
 
@@ -163,7 +163,7 @@
         else
         {
             user_list.default_session = greeter.default_session_hint;
-
+            user_list.always_show_manual = greeter.show_manual_login_hint;
             if (!greeter.hide_users_hint)
             {
                 var users = LightDM.UserList.get_instance ();
@@ -177,7 +177,7 @@
             if (greeter.has_guest_account_hint)
             {
                 debug ("Adding guest account entry");
-                user_list.add_entry ("*guest", _("Guest Session"));
+                user_list.offer_guest = true;
             }
 
             if (greeter.select_user_hint != null)
@@ -200,24 +200,35 @@
         if ((event.state & Gdk.CONTROL_MASK) == 0)
             return false;
 
-        if (event.keyval == Gdk.KEY_plus)
+        switch (event.keyval)
+        {
+        case Gdk.KEY_plus:
             add_test_entry ();
-        if (event.keyval == Gdk.KEY_minus)
+            break;
+        case Gdk.KEY_minus:
             remove_test_entry ();
-        if (event.keyval == Gdk.KEY_0)
-        {
+            break;
+        case Gdk.KEY_0:
             while (remove_test_entry ());
-            user_list.remove_entry ("*guest");
-        }
-        if (event.keyval == Gdk.KEY_equal)
-        {
+            user_list.offer_guest = false;
+            break;
+        case Gdk.KEY_equal:
             while (add_test_entry ());
-            user_list.add_entry ("*guest", _("Guest Session"));
+            user_list.offer_guest = true;
+            break;
+        case Gdk.KEY_g:
+            user_list.offer_guest = false;
+            break;
+        case Gdk.KEY_G:
+            user_list.offer_guest = true;
+            break;
+        case Gdk.KEY_m:
+            user_list.always_show_manual = false;
+            break;
+        case Gdk.KEY_M:
+            user_list.always_show_manual = true;
+            break;
         }
-        if (event.keyval == Gdk.KEY_g)
-            user_list.remove_entry ("*guest");
-        if (event.keyval == Gdk.KEY_G)
-            user_list.add_entry ("*guest", _("Guest Session"));
 
         return false;
     }

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-03-07 04:52:42 +0000
+++ src/user-list.vala	2012-03-09 04:48:17 +0000
@@ -53,6 +53,34 @@
     public MenuBar menubar;
     public UserEntry? selected_entry {get; private set; default = null;}
 
+    private bool _offer_guest = false;
+    public bool offer_guest
+    {
+        get { return _offer_guest; }
+        set
+        {
+            _offer_guest = value;
+            if (value)
+                add_entry ("*guest", _("Guest Session"));
+            else
+                remove_entry ("*guest");
+        }
+    }
+
+    private bool _always_show_manual = false;
+    public bool always_show_manual
+    {
+        get { return _always_show_manual; }
+        set
+        {
+            _always_show_manual = value;
+            if (value)
+                add_manual_entry ();
+            else if (have_users ())
+                remove_entry ("*other");
+        }
+    }
+
     private List<UserEntry> entries = null;
 
     private Gdk.Pixbuf message_pixbuf;
@@ -384,7 +412,7 @@
             select_entry (selected_entry, 1.0);
 
         /* Remove manual option when have users */
-        if (have_users ())
+        if (have_users () && !always_show_manual)
             remove_entry ("*other");
 
         redraw_user_list ();
@@ -420,7 +448,7 @@
         }
         return false;
     }
-    
+
     private void add_manual_entry ()
     {
         var text = manual_username;