aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-25 11:39:46 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-06-25 11:39:46 -0500
commitd16aaaed46f3381ea7ac4cb4c2cb491d4c5d2e03 (patch)
treeb970bd51afd67a77ab5de3780204b8528876e7ab /src
parentb3938a1f14b687d62ad1d6e4e27bac47f58722de (diff)
downloadayatana-indicator-session-d16aaaed46f3381ea7ac4cb4c2cb491d4c5d2e03.tar.gz
ayatana-indicator-session-d16aaaed46f3381ea7ac4cb4c2cb491d4c5d2e03.tar.bz2
ayatana-indicator-session-d16aaaed46f3381ea7ac4cb4c2cb491d4c5d2e03.zip
all the tests in test-users pass
Diffstat (limited to 'src')
-rw-r--r--src/backend-dbus/users.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/backend-dbus/users.c b/src/backend-dbus/users.c
index 48de06c..1ecadf3 100644
--- a/src/backend-dbus/users.c
+++ b/src/backend-dbus/users.c
@@ -93,8 +93,6 @@ set_active_uid (IndicatorSessionUsersDbus * self, guint uid)
{
priv_t * p = self->priv;
- g_message ("%s %s setting active uid to %u", G_STRLOC, G_STRFUNC, uid);
-
if (p->active_uid != uid)
{
const guint old_uid = p->active_uid;
@@ -393,8 +391,6 @@ on_login1_manager_session_list_ready (GObject * o,
GHashTable * logins = g_hash_table_new (g_direct_hash, g_direct_equal);
GVariantIter iter;
- g_message ("%s %s %s", G_STRLOC, G_STRFUNC, g_variant_print (sessions, TRUE));
-
g_variant_iter_init (&iter, sessions);
while (g_variant_iter_loop (&iter, "(&su&s&s&o)", &session_id,
&uid,
@@ -406,11 +402,13 @@ on_login1_manager_session_list_ready (GObject * o,
if (g_strcmp0 (seat_id, current_seat_id))
continue;
- if ((uid==999) && !g_strcmp0 (user_name,"ubuntu"))
- is_live_session = TRUE;
-
if (!g_strcmp0 (session_id, current_session_id))
- set_active_uid (self, uid);
+ {
+ set_active_uid (self, uid);
+
+ if ((uid==999) && !g_strcmp0 (user_name,"ubuntu"))
+ is_live_session = TRUE;
+ }
/* only count user accounts and the live session */
if (uid >= 999)