Merge lp:~robert-ancell/unity-greeter/hidden-accounts into lp:unity-greeter

[Robert Ancell]

Add option to hide certain users until alt+ctrl+shift is pressed

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

[David Barth (dbarth)]

+1

review: Approve

=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml	2014-02-18 21:33:56 +0000
+++ data/com.canonical.unity-greeter.gschema.xml	2014-03-26 04:41:56 +0000
@@ -90,5 +90,9 @@
       <default>['ug-accessibility', 'com.canonical.indicator.keyboard', 'com.canonical.indicator.session', 'com.canonical.indicator.datetime', 'com.canonical.indicator.power', 'com.canonical.indicator.sound', 'application']</default>
       <summary>Which indicators to load</summary>
     </key>
+    <key name="hidden-users" type="as">
+      <default>[]</default>
+      <summary>List of usernames that are hidden until a special key combination is hit</summary>
+    </key>
   </schema>
 </schemalist>
 
=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2014-03-12 03:19:13 +0000
+++ src/greeter-list.vala	2014-03-26 04:41:56 +0000
@@ -374,7 +374,7 @@
     {
         foreach (var e in entries)
         {
-            if (!e.id.has_prefix ("*"))
+            if (e.id != "*other")
                 return true;
         }
         return false;
 
=== modified file 'src/main-window.vala'
--- src/main-window.vala	2014-02-27 04:53:21 +0000
+++ src/main-window.vala	2014-03-26 04:41:56 +0000
@@ -20,7 +20,6 @@
 
 public class MainWindow : Gtk.Window
 {
-    public UserList user_list;
     public MenuBar menubar;
 
     private List<Monitor> monitors;
@@ -283,6 +282,25 @@
     {
         var top = stack.top ();
 
+        if (stack.top () is UserList)
+        {
+            var user_list = stack.top () as UserList;
+            if (!user_list.show_hidden_users)
+            {
+                var shift_mask = Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.MOD1_MASK;
+                var control_mask = Gdk.ModifierType.SHIFT_MASK | Gdk.ModifierType.MOD1_MASK;
+                var alt_mask = Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK;
+                if (((event.keyval == Gdk.Key.Shift_L || event.keyval == Gdk.Key.Shift_R) && (event.state & shift_mask) == shift_mask) ||
+                    ((event.keyval == Gdk.Key.Control_L || event.keyval == Gdk.Key.Control_R) && (event.state & control_mask) == control_mask) ||
+                    ((event.keyval == Gdk.Key.Alt_L || event.keyval == Gdk.Key.Alt_R) && (event.state & alt_mask) == alt_mask))
+                {
+                    debug ("Hidden user key combination detected");
+                    user_list.show_hidden_users = true;
+                    return true;
+                }
+            }
+        }
+
         switch (event.keyval)
         {
         case Gdk.KEY_Escape:
 
=== modified file 'src/settings.vala'
--- src/settings.vala	2014-02-18 21:33:56 +0000
+++ src/settings.vala	2014-03-26 04:41:56 +0000
@@ -39,6 +39,7 @@
     public static const string KEY_SCREEN_READER = "screen-reader";
     public static const string KEY_PLAY_READY_SOUND = "play-ready-sound";
     public static const string KEY_INDICATORS = "indicators";
+    public static const string KEY_HIDDEN_USERS = "hidden-users";
 
     public static bool get_boolean (string key)
     {
 
=== modified file 'src/user-list.vala'
--- src/user-list.vala	2014-03-12 03:19:13 +0000
+++ src/user-list.vala	2014-03-26 04:41:56 +0000
@@ -64,6 +64,50 @@
     /* User to authenticate against */
     private string ?authenticate_user = null;
 
+    private bool show_hidden_users_ = false;
+    public bool show_hidden_users
+    {
+        set
+        {
+            show_hidden_users_ = value;
+
+            if (UnityGreeter.singleton.test_mode)
+            {
+                if (value)
+                    add_user ("hidden", "Hidden User", null, false, false, null);
+                else
+                    remove_entry ("hidden");
+                return;
+            }
+
+            var hidden_users = UGSettings.get_strv (UGSettings.KEY_HIDDEN_USERS);
+            if (!value)
+            {
+                foreach (var username in hidden_users)
+                    remove_entry (username);
+                return;
+            }
+
+            var users = LightDM.UserList.get_instance ();
+            foreach (var user in users.users)
+            {
+                foreach (var username in hidden_users)
+                {
+                    if (user.name == username)
+                    {
+                        debug ("Showing hidden user %s", username);
+                        user_added_cb (user);
+                    }
+                }
+            }
+        }
+
+        get
+        {
+            return show_hidden_users_;
+        }
+    }
+
     private string _default_session = "ubuntu";
     public string default_session
     {
@@ -968,7 +1012,7 @@
             }
 
             /* If we have no entries at all, we should show manual */
-            if (!have_entries () && !always_show_manual)
+            if (!have_entries ())
                 add_manual_entry ();
 
             var last_user = UnityGreeter.singleton.get_state ("last-user");
@@ -983,6 +1027,14 @@
     {
         debug ("Adding/updating user %s (%s)", user.name, user.real_name);
 
+        if (!show_hidden_users)
+        {
+            var hidden_users = UGSettings.get_strv (UGSettings.KEY_HIDDEN_USERS);
+            foreach (var username in hidden_users)
+                if (username == user.name)
+                    return;
+        }
+
         var label = user.real_name;
         if (user.real_name == "")
             label = user.name;