diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-11-13 15:05:50 -0600 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-11-13 15:05:50 -0600 |
commit | f2847c772b1a4eeb19a8052503eaa4968e46d16a (patch) | |
tree | cb94f920d7127cb7dacbf200cab5f226c2a79563 /src/session-menu-mgr.c | |
parent | 9f1a3f8f6338dc0ed7db17df8d03937410e02cf4 (diff) | |
parent | a7b8ed9c8c18e48c51d08ca1b0ef0ab3de485461 (diff) | |
download | ayatana-indicator-session-f2847c772b1a4eeb19a8052503eaa4968e46d16a.tar.gz ayatana-indicator-session-f2847c772b1a4eeb19a8052503eaa4968e46d16a.tar.bz2 ayatana-indicator-session-f2847c772b1a4eeb19a8052503eaa4968e46d16a.zip |
sync with lp:indicator-session
Diffstat (limited to 'src/session-menu-mgr.c')
-rw-r--r-- | src/session-menu-mgr.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c index 697218f..427f274 100644 --- a/src/session-menu-mgr.c +++ b/src/session-menu-mgr.c @@ -775,6 +775,7 @@ user_menuitem_new (AccountsUser * user, SessionMenuMgr * mgr) /* set the is-current-user property */ const gboolean is_current_user = !g_strcmp0 (g_get_user_name(), accounts_user_get_user_name(user)); + dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_IS_CURRENT_USER, is_current_user); @@ -1077,9 +1078,14 @@ static void action_func_switch_to_user (AccountsUser * user) { SessionMenuMgr * mgr = user_get_mgr (user); + g_return_if_fail (mgr != NULL); - action_func_lock (mgr); - users_service_dbus_activate_user_session (mgr->users_dbus_facade, user); + + if (g_strcmp0 (g_get_user_name(), accounts_user_get_user_name(user)) != 0) + { + action_func_lock (mgr); + users_service_dbus_activate_user_session (mgr->users_dbus_facade, user); + } } static void |