aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-01-22 15:14:22 +0000
committerTarmac <Unknown>2014-01-22 15:14:22 +0000
commitcf046c6cc7707602f3e5d0a51c6d2152f06849f9 (patch)
tree6f8014c207c4869ebddbc3ed67067fbbaac3e83a
parente8a7320e285d9feb6665c10efea8094ce306c213 (diff)
parent8362fed93ded348c8a6cbec47c98965e888ea6bc (diff)
downloadayatana-indicator-session-cf046c6cc7707602f3e5d0a51c6d2152f06849f9.tar.gz
ayatana-indicator-session-cf046c6cc7707602f3e5d0a51c6d2152f06849f9.tar.bz2
ayatana-indicator-session-cf046c6cc7707602f3e5d0a51c6d2152f06849f9.zip
Use username as label if the real name is empty or whitespace. Fixes: https://bugs.launchpad.net/bugs/872908.
Approved by Ted Gould, PS Jenkins bot.
-rw-r--r--src/service.c19
-rw-r--r--tests/test-service.cc30
2 files changed, 46 insertions, 3 deletions
diff --git a/src/service.c b/src/service.c
index 9d9b953..2bccaae 100644
--- a/src/service.c
+++ b/src/service.c
@@ -274,6 +274,19 @@ on_user_removed (IndicatorSessionUsers * backend_users G_GNUC_UNUSED,
}
static const char *
+get_user_label (const IndicatorSessionUser * user)
+{
+ const char * c;
+
+ /* If blank or whitespace, use username instead */
+ for (c = user->real_name; *c != '\0' && g_ascii_isspace (*c); c++);
+ if (*c == '\0')
+ return user->user_name;
+
+ return user->real_name;
+}
+
+static const char *
get_current_real_name (IndicatorSessionService * self)
{
GHashTableIter iter;
@@ -289,7 +302,7 @@ get_current_real_name (IndicatorSessionService * self)
{
IndicatorSessionUser * user = value;
if (user->is_current_user)
- return user->real_name;
+ return get_user_label (user);
}
return "";
@@ -435,7 +448,7 @@ compare_users_by_label (gconstpointer ga, gconstpointer gb)
const IndicatorSessionUser * a = *(const IndicatorSessionUser**)ga;
const IndicatorSessionUser * b = *(const IndicatorSessionUser**)gb;
- if ((i = g_strcmp0 (a->real_name, b->real_name)))
+ if ((i = g_strcmp0 (get_user_label (a), get_user_label (b))))
return i;
return g_strcmp0 (a->user_name, b->user_name);
@@ -536,7 +549,7 @@ create_switch_section (IndicatorSessionService * self)
const IndicatorSessionUser * u = g_ptr_array_index (users, i);
GVariant * serialized_icon;
- item = g_menu_item_new (u->real_name, NULL);
+ item = g_menu_item_new (get_user_label (u), NULL);
g_menu_item_set_action_and_target (item, "indicator.switch-to-user", "s", u->user_name);
g_menu_item_set_attribute (item, "x-canonical-type", "s", "indicator.user-menu-item");
diff --git a/tests/test-service.cc b/tests/test-service.cc
index 5ec86d2..f14fe61 100644
--- a/tests/test-service.cc
+++ b/tests/test-service.cc
@@ -819,3 +819,33 @@ TEST_F (ServiceTest, User)
wait_for_signal (mock_settings, "changed::last-command");
check_last_command_is ("switch-to-user::tbaker");
}
+
+TEST_F (ServiceTest, UserLabels)
+{
+ int pos = 0;
+ GMenuModel * switch_menu = 0;
+
+ // Check label uses username when real name is blank
+ IndicatorSessionUser * u = g_new0 (IndicatorSessionUser, 1);
+ u->uid = 100;
+ u->user_name = g_strdup ("blank");
+ u->real_name = g_strdup ("");
+ indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+ wait_for_menu_resync ();
+ ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
+ check_label ("blank", switch_menu, 2);
+ g_clear_object (&switch_menu);
+ indicator_session_users_mock_remove_user (INDICATOR_SESSION_USERS_MOCK(mock_users), 100);
+
+ // Check label uses username when real name is all whitespace
+ u = g_new0 (IndicatorSessionUser, 1);
+ u->uid = 100;
+ u->user_name = g_strdup ("whitespace");
+ u->real_name = g_strdup (" ");
+ indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+ wait_for_menu_resync ();
+ ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
+ check_label ("whitespace", switch_menu, 2);
+ g_clear_object (&switch_menu);
+ indicator_session_users_mock_remove_user (INDICATOR_SESSION_USERS_MOCK(mock_users), 100);
+}