aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-03-03 20:54:37 -0600
committerTed Gould <ted@gould.cx>2010-03-03 20:54:37 -0600
commit3be37d1ba50935f68435083548609a055f1f5751 (patch)
treef004bda94d04fe98171f2ae3a85967cc20bc638e /src
parenta6d04fe9a6dbd6c4b9b119686523962bf9147a8b (diff)
parent03c045f5890162a53ed613fcf8f627f0dc3badc8 (diff)
downloadayatana-indicator-session-3be37d1ba50935f68435083548609a055f1f5751.tar.gz
ayatana-indicator-session-3be37d1ba50935f68435083548609a055f1f5751.tar.bz2
ayatana-indicator-session-3be37d1ba50935f68435083548609a055f1f5751.zip
Sorting based on real names and conflict naming.
Diffstat (limited to 'src')
-rw-r--r--src/session-service.c16
-rw-r--r--src/users-service-dbus.c1
-rw-r--r--src/users-service-dbus.h2
3 files changed, 18 insertions, 1 deletions
diff --git a/src/session-service.c b/src/session-service.c
index 289bff8..85874b6 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -406,7 +406,15 @@ compare_users_by_username (const gchar *a,
UserData *user1 = (UserData *)a;
UserData *user2 = (UserData *)b;
- return g_strcmp0 (user1->user_name, user2->user_name);
+ gint retval = g_strcmp0 (user1->real_name, user2->real_name);
+
+ /* If they're the same, they're both in conflict. */
+ if (retval == 0) {
+ user1->real_name_conflict = TRUE;
+ user2->real_name_conflict = TRUE;
+ }
+
+ return retval;
}
/* Builds up the menu for us */
@@ -498,7 +506,13 @@ rebuild_items (DbusmenuMenuitem *root,
mi = dbusmenu_menuitem_new ();
dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE);
+ if (user->real_name_conflict) {
+ gchar * conflictedname = g_strdup_printf("%s (%s)", user->real_name, user->user_name);
+ dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, conflictedname);
+ g_free(conflictedname);
+ } else {
dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name);
+ }
dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL);
dbusmenu_menuitem_child_append (root, mi);
g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user);
diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c
index 2b984cd..4aefdff 100644
--- a/src/users-service-dbus.c
+++ b/src/users-service-dbus.c
@@ -656,6 +656,7 @@ sync_users (UsersServiceDbus *self)
user->shell = g_strdup (g_value_get_string (g_value_array_get_nth (values, 3)));
user->login_count = g_value_get_int (g_value_array_get_nth (values, 4));
user->icon_url = g_strdup (g_value_get_string (g_value_array_get_nth (values, 5)));
+ user->real_name_conflict = FALSE;
g_hash_table_insert (priv->users,
g_strdup (user->user_name),
diff --git a/src/users-service-dbus.h b/src/users-service-dbus.h
index 41052f8..bba88a7 100644
--- a/src/users-service-dbus.h
+++ b/src/users-service-dbus.h
@@ -47,6 +47,8 @@ struct _UserData
GList *sessions;
+ gboolean real_name_conflict;
+
UsersServiceDbus *service;
};