aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-03-09 15:28:05 -0600
committerTed Gould <ted@gould.cx>2012-03-09 15:28:05 -0600
commit59aeee2af527feb71089354f29d5155a40512f9f (patch)
tree449fcbf1ebbe231afd84c4827f2e3940ee6f1b0d /src
parenta2a0779d48c596f1fda30a2d502bb3d419a83164 (diff)
parent0034324b42274ffa51e280098eee33b85215ac3d (diff)
downloadayatana-indicator-session-59aeee2af527feb71089354f29d5155a40512f9f.tar.gz
ayatana-indicator-session-59aeee2af527feb71089354f29d5155a40512f9f.tar.bz2
ayatana-indicator-session-59aeee2af527feb71089354f29d5155a40512f9f.zip
Import upstream version 0.3.93
Diffstat (limited to 'src')
-rw-r--r--src/apt-watcher.c7
-rw-r--r--src/user-menu-mgr.c28
2 files changed, 30 insertions, 5 deletions
diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 6e8a5c9..c638a93 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -115,15 +115,16 @@ 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,
_("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
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;
+ }
}