Merge lp:~cjcurran/indicator-session/hide-real-name-on-panel-gsetting into lp:indicator-session/0.1

[Conor Curran]

hide real name from panel, along for user name in switch menu item

[Ted Gould (ted)]

review: Approve

=== modified file 'data/com.canonical.indicator.session.gschema.xml.in'
--- data/com.canonical.indicator.session.gschema.xml.in	2011-09-06 17:07:55 +0000
+++ data/com.canonical.indicator.session.gschema.xml.in	2011-09-08 17:45:23 +0000
@@ -20,11 +20,23 @@
       <_summary>Remove the shutdown item from the session menu</_summary>
       <_description>Makes it so that the shutdown button doesn’t show in the session menu.</_description>
     </key>
+    <key type="b" name="show-real-name-on-panel">
+      <default>true</default>
+      <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>Determine the visibility of the User Menu</summary>
       <description>Allow for the user menu to be hidden by the user.</description>
     </key>
+    <key type="b" name="use-username-in-switch-item">
+      <default>false</default>
+      <summary>Determine what string to use for the user's name in the switch menuitem.</summary>
+      <description>The switch menuitem as part of the user menu should be default have the label 'Switch User Account'.
+      This settings gives the user the potential to have the label read 'Switch from $username'</description>
+    </key>
+
   </schema>
   
 </schemalist>

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2011-09-06 16:59:18 +0000
+++ src/indicator-session.c	2011-09-08 17:45:23 +0000
@@ -539,10 +539,16 @@
   if (g_strcmp0(translate, "1") != 0) {
     no_name_in_lang = TRUE;
   }
+  
+  GSettings* settings = g_settings_new ("com.canonical.indicator.session");
+  gboolean use_username = g_settings_get_boolean (settings,
+                                                  "use-username-in-switch-item");    
+  g_object_unref (settings);
 
   if (variant == NULL || g_variant_get_string(variant, NULL) == NULL ||
-      g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang) {
-    finalstring = _("Switch User…");
+      g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang 
+      || use_username == FALSE) {
+    finalstring = _("Switch User Account…");
     set_ellipsize = FALSE;
   }
 
@@ -587,7 +593,6 @@
       gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_NONE);
     }
   }
-
 	return;
 }
 
@@ -698,13 +703,21 @@
 static void
 indicator_session_update_users_label (IndicatorSession* self, 
                                       const gchar* name)
-{
-  g_debug ("update users label");
-  
+{  
   if (name == NULL){
     gtk_widget_hide(GTK_WIDGET(self->users.label));
     return;
   }  
+
+  GSettings* settings = g_settings_new ("com.canonical.indicator.session");
+  gboolean use_name = g_settings_get_boolean (settings,
+                                              "show-real-name-on-panel");    
+  g_object_unref (settings);
   gtk_label_set_text (self->users.label, g_strdup(name));
-  gtk_widget_show(GTK_WIDGET(self->users.label));
+  if (use_name){ 
+    gtk_widget_show(GTK_WIDGET(self->users.label));
+  }
+  else{
+    gtk_widget_hide(GTK_WIDGET(self->users.label));
+  }
 }

=== modified file 'src/settings-helper.h'
--- src/settings-helper.h	2011-09-06 16:36:25 +0000
+++ src/settings-helper.h	2011-09-08 17:45:23 +0000
@@ -21,7 +21,7 @@
 
 
 #ifndef __GCONF_HELPER_H__
-#define __GCONF_HELPER_H__ 1
+#define __GCONF_HELPER_H__ 
 
 #include <glib/gi18n.h>
 
@@ -31,12 +31,13 @@
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
 
-#define SESSION_SCHEMA      "com.canonical.indicator.session"
-#define SUPPRESS_KEY        "suppress-logout-restart-shutdown"
-#define LOGOUT_KEY          "suppress-logout-menuitem"
-#define RESTART_KEY         "suppress-restart-menuitem"
-#define SHUTDOWN_KEY        "suppress-shutdown-menuitem"
-#define SHOW_USER_MENU      "user-show-menu"
+#define SESSION_SCHEMA                "com.canonical.indicator.session"
+#define SUPPRESS_KEY                  "suppress-logout-restart-shutdown"
+#define LOGOUT_KEY                    "suppress-logout-menuitem"
+#define RESTART_KEY                   "suppress-restart-menuitem"
+#define SHUTDOWN_KEY                  "suppress-shutdown-menuitem"
+#define SHOW_USER_MENU                "user-show-menu"
+#define USER_USERNAME_IN_SWITCH_ITEM  "use-username-in-switch-item"
 
 #define LOCKDOWN_SCHEMA           "org.gnome.desktop.lockdown"
 #define LOCKDOWN_KEY_USER         "disable-user-switching"