aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2012-02-10 18:33:14 +1100
committerRobert Ancell <robert.ancell@canonical.com>2012-02-10 18:33:14 +1100
commit9dec8f6fe22ccd4c52dd1d7e9fd925b87c2830c7 (patch)
tree0eac10348ff9b5b6c88ae7100b8784154fee54d3 /src
parent512b6ab53a8d2b023131c60087b04b6dc216e4fe (diff)
downloadayatana-indicator-session-9dec8f6fe22ccd4c52dd1d7e9fd925b87c2830c7.tar.gz
ayatana-indicator-session-9dec8f6fe22ccd4c52dd1d7e9fd925b87c2830c7.tar.bz2
ayatana-indicator-session-9dec8f6fe22ccd4c52dd1d7e9fd925b87c2830c7.zip
Don't lock the session when switching to another one - something else (ConsoleKit?) already does this and locks it regardless of if the setting has been configured.
By explicitly doing the lock it means we can't override it inside GNOME screensaver to switch to the greeter instead, so this patch removes the code.
Diffstat (limited to 'src')
-rw-r--r--src/user-menu-mgr.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 3f4bdc4..7aad2af 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -285,29 +285,11 @@ check_new_session ()
return TRUE;
}
-/* Check to see if the lockdown key is protecting from
- locking the screen. If not, lock it. */
-static void
-lock_if_possible (void) {
- ensure_settings_client ();
-
- if (!g_settings_get_boolean (settings, LOCKDOWN_KEY_SCREENSAVER)) {
- lock_screen(NULL, 0, NULL);
- }
-
- return;
-}
-
-
/* Starts a new generic session */
static void
activate_new_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
{
- lock_if_possible();
-
- users_service_dbus_show_greeter (USERS_SERVICE_DBUS(user_data));
-
- return;
+ users_service_dbus_show_greeter (USERS_SERVICE_DBUS(user_data));
}
/* Activates a session for a particular user. */
@@ -317,8 +299,6 @@ activate_user_session (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data
UserData *user = (UserData *)user_data;
UsersServiceDbus *service = user->service;
- lock_if_possible();
-
users_service_dbus_activate_user_session (service, user);
}
@@ -406,11 +386,7 @@ activate_guest_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_da
UserMenuMgr* user_mgr = USER_MENU_MGR(user_data);
UsersServiceDbus *service = user_mgr->users_dbus_interface;
- lock_if_possible();
-
- if (users_service_dbus_activate_guest_session(service)) {
- return;
- }
+ users_service_dbus_activate_guest_session(service);
}