Merge lp:~laney/indicator-session/hide-user-list into lp:indicator-session/14.04

[Iain Lane]

Re-add the feature to hide the user list if com.canonical.indicator.session user-show-menu is false

I think this is the right way to handle a boolean GSetting still, but let me know if it's not.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:437
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/125/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM

review: Approve

=== modified file 'data/com.canonical.indicator.session.gschema.xml.in'
--- data/com.canonical.indicator.session.gschema.xml.in	2012-06-19 17:30:41 +0000
+++ data/com.canonical.indicator.session.gschema.xml.in	2014-03-19 17:45:02 +0000
@@ -25,6 +25,11 @@
       <summary>Determine the visibility of the User's real name on the panel</summary>
       <description>Allow for the Removal of the users name from the panel</description>
     </key>
+    <key type="b" name="user-show-menu">
+      <default>true</default>
+      <summary>Show the list of users</summary>
+      <description>Allow for the user list to be hidden by the user.</description>
+    </key>
 
   </schema>
   

=== modified file 'src/service.c'
--- src/service.c	2014-03-11 14:02:31 +0000
+++ src/service.c	2014-03-19 17:45:02 +0000
@@ -155,6 +155,14 @@
 ****
 ***/
 
+static gboolean
+show_user_list (IndicatorSessionService * self)
+{
+  return g_settings_get_boolean (self->priv->indicator_settings,
+                                 "user-show-menu");
+}
+
+
 static GVariant *
 action_state_for_header (IndicatorSessionService * self)
 {
@@ -267,6 +275,32 @@
 }
 
 static void
+maybe_add_users (IndicatorSessionService * self)
+{
+  if (!show_user_list (self))
+      return;
+
+  GList * uids, * l;
+
+  uids = indicator_session_users_get_uids (self->priv->backend_users);
+  for (l=uids; l!=NULL; l=l->next)
+    add_user (self, GPOINTER_TO_UINT(l->data));
+  g_list_free (uids);
+}
+
+
+static void
+user_show_menu_changed (IndicatorSessionService * self)
+{
+  if (show_user_list (self))
+      maybe_add_users (self);
+  else
+      g_hash_table_remove_all (self->priv->users);
+
+  rebuild_switch_section_soon (self);
+}
+
+static void
 on_user_removed (IndicatorSessionUsers * backend_users G_GNUC_UNUSED,
                  guint                   uid,
                  gpointer                gself)
@@ -541,7 +575,11 @@
       g_object_unref (item);
     }
 
-  /* build an array of all the users we know of */
+  /* if we need to show the user list, build an array of all the users we know
+   * of, otherwise get out now */
+  if (!show_user_list (self))
+      return G_MENU_MODEL (menu);
+
   users = g_ptr_array_new ();
   g_hash_table_iter_init (&iter, p->users);
   while (g_hash_table_iter_next (&iter, NULL, &guser))
@@ -1053,8 +1091,6 @@
 /* cppcheck-suppress unusedFunction */
 indicator_session_service_init (IndicatorSessionService * self)
 {
-  GList * l;
-  GList * uids;
   priv_t * p;
   gpointer gp;
   GIcon * icon;
@@ -1088,10 +1124,7 @@
                                     g_direct_equal,
                                     NULL,
                                     (GDestroyNotify)indicator_session_user_free);
-  uids = indicator_session_users_get_uids (p->backend_users);
-  for (l=uids; l!=NULL; l=l->next)
-    add_user (self, GPOINTER_TO_UINT(l->data));
-  g_list_free (uids);
+  maybe_add_users (self);
 
   init_gactions (self);
 
@@ -1138,6 +1171,8 @@
                             G_CALLBACK(rebuild_session_section_soon), self);
   g_signal_connect_swapped (gp, "changed::show-real-name-on-panel",
                             G_CALLBACK(rebuild_header_soon), self);
+  g_signal_connect_swapped (gp, "changed::user-show-menu",
+                            G_CALLBACK(user_show_menu_changed), self);
 
   /* watch for changes to the lock keybinding */
   gp = p->keybinding_settings;

=== modified file 'tests/com.canonical.indicator.session.gschema.xml'
--- tests/com.canonical.indicator.session.gschema.xml	2013-03-22 21:34:34 +0000
+++ tests/com.canonical.indicator.session.gschema.xml	2014-03-19 17:45:02 +0000
@@ -26,7 +26,12 @@
       <summary>Determine the visibility of the User's real name on the panel</summary>
       <description>Allow for the Removal of the users name from the panel</description>
     </key>
+    <key type="b" name="user-show-menu">
+      <default>true</default>
+      <summary>Show the list of users</summary>
+      <description>Allow for the user menu to be hidden by the user.</description>
+    </key>
 
   </schema>
   
-</schemalist>
\ No newline at end of file
+</schemalist>

=== modified file 'tests/test-service.cc'
--- tests/test-service.cc	2013-12-19 03:02:17 +0000
+++ tests/test-service.cc	2014-03-19 17:45:02 +0000
@@ -812,6 +812,16 @@
   check_label ("Third Doctor", switch_menu, 8);
   g_clear_object (&switch_menu);
 
+  /* Hide the user list */
+  g_settings_set_boolean (indicator_settings, "user-show-menu", FALSE);
+  wait_for_menu_resync ();
+  // now there should be 2 menuitems: greeter + guest
+  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
+  ASSERT_EQ (0, pos);
+  ASSERT_EQ (2, g_menu_model_get_n_items (switch_menu));
+  g_clear_object (&switch_menu);
+  g_settings_set_boolean (indicator_settings, "user-show-menu", TRUE);
+
   // now switch to one of the doctors
   g_action_group_activate_action (G_ACTION_GROUP(action_group),
                                   "switch-to-user",