From ff2a773ff8d1f902e823f6d51b4775d448e0e9ae Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Tue, 6 Nov 2012 16:08:31 +0100
Subject: Don't lock the session when clicking on the current user

---
 src/session-menu-mgr.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3


From 8709a6ca1c048401486a632f5a6b343a9c59b313 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 12 Nov 2012 17:30:15 -0600
Subject: in user-service-dbus.c, don't crash if getting a display proxy fails.

---
 src/users-service-dbus.c | 52 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c
index fec17dc..f12f47c 100644
--- a/src/users-service-dbus.c
+++ b/src/users-service-dbus.c
@@ -927,11 +927,16 @@ users_service_dbus_get_user_list (UsersServiceDbus * self)
 void
 users_service_dbus_show_greeter (UsersServiceDbus * self)
 {
+  DisplayManagerSeat * dp;
+
   g_return_if_fail (IS_USERS_SERVICE_DBUS(self));
 
-  DisplayManagerSeat * dp = create_display_proxy (self);
-  display_manager_seat_call_switch_to_greeter_sync (dp, NULL, NULL);
-  g_clear_object (&dp);
+  dp = create_display_proxy (self);
+  if (dp != NULL)
+    {
+      display_manager_seat_call_switch_to_greeter_sync (dp, NULL, NULL);
+      g_clear_object (&dp);
+    }
 }
 
 /**
@@ -942,11 +947,16 @@ users_service_dbus_show_greeter (UsersServiceDbus * self)
 void
 users_service_dbus_activate_guest_session (UsersServiceDbus * self)
 {
-  g_return_if_fail(IS_USERS_SERVICE_DBUS(self));
+  DisplayManagerSeat * dp;
 
-  DisplayManagerSeat * dp = create_display_proxy (self);
-  display_manager_seat_call_switch_to_guest_sync (dp, "", NULL, NULL);
-  g_clear_object (&dp);
+  g_return_if_fail (IS_USERS_SERVICE_DBUS(self));
+
+  dp = create_display_proxy (self);
+  if (dp != NULL)
+    {
+      display_manager_seat_call_switch_to_guest_sync (dp, "", NULL, NULL);
+      g_clear_object (&dp);
+    }
 }
 
 /**
@@ -958,12 +968,17 @@ void
 users_service_dbus_activate_user_session (UsersServiceDbus * self,
                                           AccountsUser     * user)
 {
+  DisplayManagerSeat * dp;
+
   g_return_if_fail (IS_USERS_SERVICE_DBUS(self));
 
-  const char * const username = accounts_user_get_user_name (user);
-  DisplayManagerSeat * dp = create_display_proxy (self);
-  display_manager_seat_call_switch_to_user_sync (dp, username, "", NULL, NULL);
-  g_clear_object (&dp);
+  dp = create_display_proxy (self);
+  if (dp != NULL)
+    {
+      const char * const username = accounts_user_get_user_name (user);
+      display_manager_seat_call_switch_to_user_sync (dp, username, "", NULL, NULL);
+      g_clear_object (&dp);
+    }
 }
 
 /**
@@ -974,11 +989,18 @@ users_service_dbus_activate_user_session (UsersServiceDbus * self,
 gboolean
 users_service_dbus_guest_session_enabled (UsersServiceDbus * self)
 {
-  g_return_val_if_fail(IS_USERS_SERVICE_DBUS(self), FALSE);
+  DisplayManagerSeat * dp;
+  gboolean enabled = FALSE;
+
+  g_return_val_if_fail (IS_USERS_SERVICE_DBUS(self), enabled);
+
+  dp = create_display_proxy (self);
+  if (dp != NULL)
+    {
+      enabled = display_manager_seat_get_has_guest_account (dp);
+      g_clear_object (&dp);
+    }
 
-  DisplayManagerSeat * dp = create_display_proxy (self);
-  const gboolean enabled = display_manager_seat_get_has_guest_account (dp);
-  g_clear_object (&dp);
   return enabled;
 }
 
-- 
cgit v1.2.3