From 38923e553288e7d69d7c524bd1a7010cc83e77db Mon Sep 17 00:00:00 2001
From: Marc Deslauriers <marc.deslauriers@canonical.com>
Date: Mon, 30 Jan 2012 09:39:29 -0500
Subject: Remove dead GSS throttling code. Let gnome-settings-daemon handle
 locking the screen when UPower requests it.

---
 src/device-menu-mgr.c | 26 +---------------
 src/lock-helper.c     | 86 ---------------------------------------------------
 src/lock-helper.h     |  3 --
 3 files changed, 1 insertion(+), 114 deletions(-)

diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index 3858564..d3734a2 100644
--- a/src/device-menu-mgr.c
+++ b/src/device-menu-mgr.c
@@ -83,7 +83,6 @@ static DBusGProxy * up_prop_proxy = NULL;
 static void device_menu_mgr_ensure_settings_client (DeviceMenuMgr* self);
 static void setup_up (DeviceMenuMgr* self);
 static void device_menu_mgr_rebuild_items (DeviceMenuMgr *self);
-static void lock_if_possible (DeviceMenuMgr* self);
 static void machine_sleep_with_context (DeviceMenuMgr* self,
                                         gchar* type);
 static void show_system_settings_with_context (DbusmenuMenuitem * mi,
@@ -173,27 +172,6 @@ keybinding_changed (GSettings   *settings,
 	return;
 }
 
-/* Check to see if the lockdown key is protecting from
-   locking the screen.  If not, lock it. */
-static void
-lock_if_possible (DeviceMenuMgr* self) {
-	device_menu_mgr_ensure_settings_client (self);
-
-	if (!g_settings_get_boolean (lockdown_settings, LOCKDOWN_KEY_SCREENSAVER)) {
-		lock_screen (NULL, 0, NULL);
-	}
-	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;
-}
-
 static void
 machine_sleep_from_suspend (DbusmenuMenuitem * mi,
                             guint timestamp,
@@ -221,11 +199,9 @@ machine_sleep_with_context (DeviceMenuMgr* self, gchar* type)
 		g_warning("Can not %s as no upower proxy", type);
 	}
 
-	screensaver_throttle(type);
-	lock_if_possible (self);
 	dbus_g_proxy_begin_call(up_main_proxy,
 	                        type,
-	                        sleep_response,
+	                        NULL,
 	                        NULL,
 	                        NULL,
 	                        G_TYPE_INVALID);
diff --git a/src/lock-helper.c b/src/lock-helper.c
index 4c91aa5..8eae674 100644
--- a/src/lock-helper.c
+++ b/src/lock-helper.c
@@ -29,8 +29,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static DBusGProxy * gss_proxy = NULL;
 static GMainLoop * gss_mainloop = NULL;
-static guint cookie = 0;
-static DBusGProxyCall * cookie_call = NULL;
 
 static gboolean is_guest = FALSE;
 
@@ -38,90 +36,6 @@ static GSettings * settings = NULL;
 
 void build_gss_proxy (void);
 
-/* Checks to see if there is an error and reports
-   it.  Not much else we can do. */
-static void
-unthrottle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	GError * error = NULL;
-	dbus_g_proxy_end_call(proxy, call, &error,
-	                      G_TYPE_INVALID);
-
-	if (error != NULL) {
-		g_warning("Unable to unthrottle: %s", error->message);
-	}
-	return;
-}
-
-/* Sends an unthrottle if we're throttled. */
-void
-screensaver_unthrottle (void)
-{
-	g_return_if_fail(cookie != 0);
-
-	build_gss_proxy();
-	g_return_if_fail(gss_proxy != NULL);
-
-	dbus_g_proxy_begin_call(gss_proxy, "UnThrottle",
-	                        unthrottle_return, NULL,
-	                        NULL,
-	                        G_TYPE_UINT, cookie,
-	                        G_TYPE_INVALID);
-
-	cookie = 0;
-	return;
-}
-
-/* Gets there return cookie from the throttle command
-   and sets things valid */
-static void
-throttle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	GError * error = NULL;
-	cookie_call = NULL;
-
-	dbus_g_proxy_end_call(proxy, call, &error,
-	                      G_TYPE_UINT, &cookie,
-	                      G_TYPE_INVALID);
-
-	if (error != NULL) {
-		g_warning("Unable to throttle the screensaver: %s", error->message);
-		return;
-	}
-
-
-	if (cookie == 0) {
-		g_warning("We didn't get a throttle cookie!");
-	}
-
-	return;
-}
-
-/* Throttling the screensaver by using the screen saver
-   command. */
-void
-screensaver_throttle (gchar * reason)
-{
-	g_return_if_fail(cookie_call == NULL);
-	g_return_if_fail(will_lock_screen());
-
-	if (cookie != 0) {
-		screensaver_unthrottle();
-	}
-
-	build_gss_proxy();
-	g_return_if_fail(gss_proxy != NULL);
-
-	cookie_call = dbus_g_proxy_begin_call(gss_proxy, "Throttle",
-	                                      throttle_return, NULL,
-	                                      NULL,
-	                                      G_TYPE_STRING, "Session Menu",
-	                                      G_TYPE_STRING, reason,
-	                                      G_TYPE_INVALID);
-
-	return;
-}
-
 /* This is our logic on whether the screen should be locked
    or not.  It effects everything else. */
 gboolean
diff --git a/src/lock-helper.h b/src/lock-helper.h
index 37f1448..e2d5106 100644
--- a/src/lock-helper.h
+++ b/src/lock-helper.h
@@ -24,9 +24,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <libdbusmenu-glib/menuitem.h>
 
-void screensaver_throttle (gchar * reason);
-void screensaver_unthrottle (void);
-
 gboolean will_lock_screen (void);
 void lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data);
 gboolean lock_screen_setup (gpointer data);
-- 
cgit v1.2.3