diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/restore_session_lock.patch | 57 | ||||
| -rw-r--r-- | debian/rules | 1 |
3 files changed, 63 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ed2372f..07ce249 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ indicator-session (0.3.92-0ubuntu1) UNRELEASED; urgency=low + * debian/patches/restore_session_lock.patch, debian/rules: + - get the indicator to enforce locking again since we still have cases + where locking is not done otherwise (lp: #939518) + [ Martin Pitt ] * debian/control: Add alternative packagekit dependency, since this ought to work with either the aptdaemon pkcompat or packagekit itself. @@ -9,7 +13,7 @@ indicator-session (0.3.92-0ubuntu1) UNRELEASED; urgency=low * Make GUDev dependency optional for non-Linux kernels * Add accessibility strings on the icons (LP: #891861) - -- Ted Gould <ted@ubuntu.com> Thu, 23 Feb 2012 09:18:34 -0600 + -- Sebastien Bacher <seb128@ubuntu.com> Thu, 23 Feb 2012 19:27:24 +0100 indicator-session (0.3.91-0ubuntu1) precise; urgency=low diff --git a/debian/patches/restore_session_lock.patch b/debian/patches/restore_session_lock.patch new file mode 100644 index 0000000..ef4effb --- /dev/null +++ b/debian/patches/restore_session_lock.patch @@ -0,0 +1,57 @@ +=== modified file 'src/user-menu-mgr.c' +--- src/user-menu-mgr.c 2012-02-10 07:33:14 +0000 ++++ src/user-menu-mgr.c 2012-02-23 18:19:12 +0000 +@@ -285,11 +285,29 @@ + 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 @@ + UserData *user = (UserData *)user_data; + UsersServiceDbus *service = user->service; + ++ lock_if_possible(); ++ + users_service_dbus_activate_user_session (service, user); + } + +@@ -386,7 +406,11 @@ + 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; ++ } + } + + + diff --git a/debian/rules b/debian/rules index 43ffda2..1561939 100644 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ DEB_MAKE_FLAVORS = gtk2 gtk3 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ |