aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-09-08 14:01:36 +0100
committerConor Curran <conor.curran@canonical.com>2011-09-08 14:01:36 +0100
commit6174b1bac576198e5d3df35f93971598937e71c6 (patch)
treede31cf2284a2860bdd4b209fd443e05e922c087b
parentdaa6295ce57baca8b3e4fc574e3b8dd29cf2598e (diff)
downloadayatana-indicator-session-6174b1bac576198e5d3df35f93971598937e71c6.tar.gz
ayatana-indicator-session-6174b1bac576198e5d3df35f93971598937e71c6.tar.bz2
ayatana-indicator-session-6174b1bac576198e5d3df35f93971598937e71c6.zip
user correct string on switch item unless user actually wants to show username
-rw-r--r--data/com.canonical.indicator.session.gschema.xml.in7
-rw-r--r--src/indicator-session.c11
-rw-r--r--src/settings-helper.h15
3 files changed, 23 insertions, 10 deletions
diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in
index e0d14c3..eaebea1 100644
--- a/data/com.canonical.indicator.session.gschema.xml.in
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -25,6 +25,13 @@
<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>
diff --git a/src/indicator-session.c b/src/indicator-session.c
index f41c841..20fc643 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -539,10 +539,16 @@ switch_property_change (DbusmenuMenuitem * item,
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 @@ switch_property_change (DbusmenuMenuitem * item,
gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_NONE);
}
}
-
return;
}
diff --git a/src/settings-helper.h b/src/settings-helper.h
index ae57575..ea0c99f 100644
--- a/src/settings-helper.h
+++ b/src/settings-helper.h
@@ -21,7 +21,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef __GCONF_HELPER_H__
-#define __GCONF_HELPER_H__ 1
+#define __GCONF_HELPER_H__
#include <glib/gi18n.h>
@@ -31,12 +31,13 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#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"