* Backport "Don't lock the session when switching to another one"

  work from Robert Ancell, the screen locking is already done by 
  consolekit and enforcing it there is problematic to i.e use the 
  lightdm greeter as a lock screen (lp: #878836)
* debian/source/format:
  - use v1, v3 doesn't play nicely with vcs backports

3 files changed, 11 insertions, 29 deletions

diff --git a/debian/changelog b/debian/changelog
index b2e9991..0e9f652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,20 @@
 indicator-session (0.3.91-0ubuntu1) UNRELEASED; urgency=low
-
+  
+  * Backport "Don't lock the session when switching to another one"
+    work from Robert Ancell, the screen locking is already done by 
+    consolekit and enforcing it there is problematic to i.e use the 
+    lightdm greeter as a lock screen (lp: #878836)
   * debian/control:
     - recommends python-aptdaemon.pkcompat so packagekit doesn't get installed
+  * debian/source/format:
+    - use v1, v3 doesn't play nicely with vcs backports
 
   [ Ken VanDine ]
   * New upstream release. (lp: #903756)
   * debian/control
     - added new build depends on libpackagekit-glib2-dev
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 14 Feb 2012 18:26:00 +0100
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 14 Feb 2012 18:41:26 +0100
 
 indicator-session (0.3.90-0ubuntu1) precise; urgency=low
 
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..d3827e7 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+1.0
diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 3f4bdc4..7aad2af 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -285,29 +285,11 @@ 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)
 {
-	lock_if_possible();
-
-  users_service_dbus_show_greeter (USERS_SERVICE_DBUS(user_data));
-
-	return;
+	users_service_dbus_show_greeter (USERS_SERVICE_DBUS(user_data));
 }
 
 /* Activates a session for a particular user. */
@@ -317,8 +299,6 @@ 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);
 }
 
@@ -406,11 +386,7 @@ 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;
 
-	lock_if_possible();
-  
-  if (users_service_dbus_activate_guest_session(service)) {
-    return;
-  }
+  users_service_dbus_activate_guest_session(service);
 }