aboutsummaryrefslogtreecommitdiff
path: root/src/user-menu-mgr.c
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-02-27 18:38:21 +0100
committerSebastien Bacher <seb128@ubuntu.com>2012-02-27 18:38:21 +0100
commitaabe8764970005779fe938e44c85b844eba220cc (patch)
tree9be51434c567d9ed29ef72d342fa8c63f4238a63 /src/user-menu-mgr.c
parent2afbdf3abb677533b1fdfb25d8b0aa64ebb332f9 (diff)
downloadayatana-indicator-session-aabe8764970005779fe938e44c85b844eba220cc.tar.gz
ayatana-indicator-session-aabe8764970005779fe938e44c85b844eba220cc.tar.bz2
ayatana-indicator-session-aabe8764970005779fe938e44c85b844eba220cc.zip
Revert r239, there are still issues, to sort next cycle
Diffstat (limited to 'src/user-menu-mgr.c')
-rw-r--r--src/user-menu-mgr.c28
1 files changed, 26 insertions, 2 deletions
diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 7aad2af..3f4bdc4 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -285,11 +285,29 @@ 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)
{
- users_service_dbus_show_greeter (USERS_SERVICE_DBUS(user_data));
+ lock_if_possible();
+
+ users_service_dbus_show_greeter (USERS_SERVICE_DBUS(user_data));
+
+ return;
}
/* Activates a session for a particular user. */
@@ -299,6 +317,8 @@ 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);
}
@@ -386,7 +406,11 @@ 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;
- users_service_dbus_activate_guest_session(service);
+ lock_if_possible();
+
+ if (users_service_dbus_activate_guest_session(service)) {
+ return;
+ }
}