Merge lp:~psusi/ubuntu/natty/indicator-session/sleep into lp:ubuntu/natty/indicator-session

[Phillip Susi]

See linked bug report and related branches that all need merged together.

[Chris Halse Rogers (raof)]

Looks good to me, but I can't upload.

review: Approve

Unmerged revisions

45. By Phillip Susi on 2011-03-19

Remove screen saver start and lock functions, as this is
the job of gnome-power-manager (LP: #578542).

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-10 16:10:19 +0000
+++ debian/changelog	2011-03-19 03:39:27 +0000
@@ -1,3 +1,10 @@
+indicator-session (0.2.15-0ubuntu2) natty; urgency=low
+
+  * Remove screen saver start and lock functions, as this is
+    the job of gnome-power-manager (LP: #578542).
+
+ -- Phillip Susi <[e-mail]>  Mon, 07 Mar 2011 19:14:47 -0500
+
 indicator-session (0.2.15-0ubuntu1) natty; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-02-17 13:31:40 +0000
+++ debian/control	2011-03-19 03:39:27 +0000
@@ -20,7 +20,7 @@
 
 Package: indicator-session
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, upower
+Depends: ${shlibs:Depends}, ${misc:Depends}, upower (>= 0.9.8-3ubuntu1)
 Recommends: indicator-applet (>= 0.2) | indicator-renderer
 Suggests: gdm
 Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
 
=== modified file 'src/session-service.c'
--- src/session-service.c	2011-03-10 16:10:19 +0000
+++ src/session-service.c	2011-03-19 03:39:27 +0000
@@ -176,15 +176,6 @@
 	return;
 }
 
-/* A return from the command to sleep the system.  Make sure
-   that we unthrottle the screensaver. */
-static void
-sleep_response (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	screensaver_unthrottle();
-	return;
-}
-
 /* Let's put this machine to sleep, with some info on how
    it should sleep.  */
 static void
@@ -196,12 +187,9 @@
 		g_warning("Can not %s as no upower proxy", type);
 	}
 
-	screensaver_throttle(type);
-	lock_if_possible();
-
 	dbus_g_proxy_begin_call(up_main_proxy,
 	                        type,
-	                        sleep_response,
+	                        NULL,
 	                        NULL,
 	                        NULL,
 	                        G_TYPE_INVALID);