From aabe8764970005779fe938e44c85b844eba220cc Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 27 Feb 2012 18:38:21 +0100 Subject: Revert r239, there are still issues, to sort next cycle --- src/user-menu-mgr.c | 28 ++++++++++++++++++++++++++-- 1 file 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; + } } -- cgit v1.2.3 From 0810650fabce99c29ee5b4c9966a68a07b230058 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 6 Mar 2012 09:43:37 +0000 Subject: listen for the right signal --- src/apt-watcher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apt-watcher.c b/src/apt-watcher.c index 6e8a5c9..b62354a 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -115,7 +115,7 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy, g_debug ("updates changed signal received"); apt_watcher_check_for_updates (self); } - else if (g_strcmp0(signal_name, "RestartScheduled") == 0) { + else if (g_strcmp0(signal_name, "RestartSchedule") == 0) { g_debug ("RestartScheduled signal received"); dbusmenu_menuitem_property_set (self->apt_item, DBUSMENU_MENUITEM_PROP_LABEL, -- cgit v1.2.3 From 98f37a07e608cd3fb1e86594a536f352a4ef13ff Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 6 Mar 2012 12:10:53 +0000 Subject: make sure to change the icon on the panel when we get a restart signal from package kit --- src/apt-watcher.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/apt-watcher.c b/src/apt-watcher.c index b62354a..c638a93 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -122,8 +122,9 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy, _("Restart to Complete Updates…")); dbusmenu_menuitem_property_set (self->apt_item, DBUSMENU_MENUITEM_PROP_DISPOSITION, - DBUSMENU_MENUITEM_DISPOSITION_ALERT); - } + DBUSMENU_MENUITEM_DISPOSITION_ALERT); + session_dbus_restart_required (self->session_dbus_interface); + } } static void -- cgit v1.2.3 From 0034324b42274ffa51e280098eee33b85215ac3d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Mar 2012 15:22:31 -0600 Subject: 0.3.93 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ab12f12..a80f6c7 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.3.92) +AM_INIT_AUTOMAKE(indicator-session, 0.3.93) AM_MAINTAINER_MODE -- cgit v1.2.3