Merge lp:~robert-ancell/unity-control-center/show-login-name into lp:unity-control-center

[Robert Ancell]

Add option to toggle username in session indicator

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12705
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/14/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for working on that Robert!

The glib API [1] suggests to use g_settings_schema_source_lookup () rather than the loop approch, can you change that?
(https://developer.gnome.org/gio/unstable/gio-GSettingsSchema-GSettingsSchemaSource.html#g-settings-schema-source-lookup)

Otherwise code/behaviour looks fine

[1] https://developer.gnome.org/gio/unstable/GSettings.html#g-settings-list-schemas

review: Needs Fixing

[lp:~robert-ancell/unity-control-center/show-login-name]

12706. By Robert Ancell on 2014-02-17

Use g_settings_schema_source_lookup instead of g_settings_list_schemas

=== modified file 'panels/user-accounts/data/user-accounts-dialog.ui'
--- panels/user-accounts/data/user-accounts-dialog.ui	2012-08-18 17:12:38 +0000
+++ panels/user-accounts/data/user-accounts-dialog.ui	2014-02-17 21:23:56 +0000
@@ -436,6 +436,34 @@
                             <property name="y_options">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="show-login-name-spacer">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">7</property>
+                            <property name="bottom_attach">8</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="show-login-name-checkbutton">
+                            <property name="label" translatable="yes">_Show my login name in the menu bar</property>
+                            <property name="use_underline">True</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">8</property>
+                            <property name="bottom_attach">9</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">0</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>

=== modified file 'panels/user-accounts/um-user-panel.c'
--- panels/user-accounts/um-user-panel.c	2013-11-29 06:28:37 +0000
+++ panels/user-accounts/um-user-panel.c	2014-02-17 21:23:56 +0000
@@ -55,6 +55,7 @@
 #include "cc-common-language.h"
 
 #define USER_ACCOUNTS_PERMISSION "com.canonical.controlcenter.user-accounts.administration"
+#define INDICATOR_SESSION_SCHEMA "com.canonical.indicator.session"
 
 CC_PANEL_REGISTER (UmUserPanel, um_user_panel)
 
@@ -71,6 +72,8 @@
 
         UmPasswordDialog *password_dialog;
         UmPhotoDialog *photo_dialog;
+
+        GSettings *indicator_session_schema;
 };
 
 static GtkWidget *
@@ -635,6 +638,14 @@
                !is_using_ecryptfs (um_user_get_user_name (user));
         gtk_widget_set_visible (widget, show);
         gtk_widget_set_visible (label, show);
+
+        /* Menu bar: show when self and have indicator schema */
+        widget = get_widget (d, "show-login-name-checkbutton");
+        label = get_widget (d, "show-login-name-spacer");
+        show = um_user_get_uid (user) == getuid() &&
+               d->indicator_session_schema;
+        gtk_widget_set_visible (widget, show);
+        gtk_widget_set_visible (label, show);
 }
 
 static void on_permission_changed (GPermission *permission, GParamSpec *pspec, gpointer data);
@@ -1295,6 +1306,7 @@
         const gchar *filename;
         GtkWidget *button;
         GtkStyleContext *context;
+        GSettingsSchema *schema;
 
         d = self->priv = UM_USER_PANEL_PRIVATE (self);
 
@@ -1330,6 +1342,13 @@
         gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
         context = gtk_widget_get_style_context (get_widget (d, "add-remove-toolbar"));
         gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
+
+        schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (), INDICATOR_SESSION_SCHEMA, TRUE);
+        if (schema) {
+                d->indicator_session_schema = g_settings_new (INDICATOR_SESSION_SCHEMA);
+                g_settings_bind (d->indicator_session_schema, "show-real-name-on-panel", get_widget (d, "show-login-name-checkbutton"), "active", G_SETTINGS_BIND_DEFAULT);
+                g_object_unref (schema);
+        }
 }
 
 static void