diff options
author | Ted Gould <ted@gould.cx> | 2012-03-09 15:26:56 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2012-03-09 15:26:56 -0600 |
commit | 4930d8b50fcd5d92eec258659a78278d3d253db6 (patch) | |
tree | 0c6c42ff52b40e25debd2d7e1da385b990ca036b /src/user-menu-mgr.c | |
parent | 9bdc8031ccdd14ac1cb6ecb959210b8631059b77 (diff) | |
parent | ed3bab33563907dcd32ac4371f0c825cb4d980f5 (diff) | |
download | ayatana-indicator-session-4930d8b50fcd5d92eec258659a78278d3d253db6.tar.gz ayatana-indicator-session-4930d8b50fcd5d92eec258659a78278d3d253db6.tar.bz2 ayatana-indicator-session-4930d8b50fcd5d92eec258659a78278d3d253db6.zip |
Sync with U. Desktop
Diffstat (limited to 'src/user-menu-mgr.c')
-rw-r--r-- | src/user-menu-mgr.c | 28 |
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; + } } |