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(-) (limited to 'src') 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(-) (limited to 'src') 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(-) (limited to 'src') 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 6f222333dd2c85a8023ed0e4b05c6ff7f74f3731 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Mar 2012 14:26:42 +0100 Subject: src/apt-watcher.c: check the pk_results_get_require_restart_worst() in get_updates() too --- src/apt-watcher.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src') diff --git a/src/apt-watcher.c b/src/apt-watcher.c index c638a93..73ebdb9 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -52,6 +52,7 @@ get_updates_complete (GObject *source_object, AptWatcher* self = APT_WATCHER (user_data); PkResults *results; + PkRestartEnum restart_required; GError *error = NULL; results = pk_client_generic_finish (PK_CLIENT(source_object), res, &error); @@ -83,6 +84,20 @@ get_updates_complete (GObject *source_object, DBUSMENU_MENUITEM_PROP_LABEL, _("Software Up to Date")); } + + /* check if there was a restart required info in the signal */ + restart_required = pk_results_get_require_restart_worst (results); + if (restart_required == PK_RESTART_ENUM_SYSTEM || + restart_required == PK_RESTART_ENUM_SECURITY_SYSTEM) { + dbusmenu_menuitem_property_set (self->apt_item, + DBUSMENU_MENUITEM_PROP_LABEL, + _("Restart to Complete Updates…")); + dbusmenu_menuitem_property_set (self->apt_item, + DBUSMENU_MENUITEM_PROP_DISPOSITION, + DBUSMENU_MENUITEM_DISPOSITION_ALERT); + session_dbus_restart_required (self->session_dbus_interface); + } + g_ptr_array_unref (packages); g_object_unref (results); g_object_unref (source_object); -- cgit v1.2.3 From 9e862f15a1f4a86a0a5215c27d6d71905efebfd5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Mar 2012 14:28:01 +0100 Subject: src/apt-watcher.c: remove no longer needed code, this RestartRequired is a bit misleading as it about that the PK daemon got restarted not about system or session --- src/apt-watcher.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src') diff --git a/src/apt-watcher.c b/src/apt-watcher.c index 73ebdb9..092942f 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -130,16 +130,6 @@ 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, "RestartSchedule") == 0) { - g_debug ("RestartScheduled signal received"); - dbusmenu_menuitem_property_set (self->apt_item, - DBUSMENU_MENUITEM_PROP_LABEL, - _("Restart to Complete Updates…")); - dbusmenu_menuitem_property_set (self->apt_item, - DBUSMENU_MENUITEM_PROP_DISPOSITION, - DBUSMENU_MENUITEM_DISPOSITION_ALERT); - session_dbus_restart_required (self->session_dbus_interface); - } } static void -- cgit v1.2.3