Merge lp:~larsu/indicator-session/lp1024392 into lp:indicator-session/13.04

[Lars Karlitski]

Don't lock the session when clicking on the current user

Don't lock the session when clicking on the current user

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/21/console

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/session-menu-mgr.c'
--- src/session-menu-mgr.c	2012-10-17 22:46:05 +0000
+++ src/session-menu-mgr.c	2012-11-06 15:13:03 +0000
@@ -775,6 +775,7 @@
   /* 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 @@
 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