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/lock-helper.c | 86 -------------------------------------------------------
 1 file changed, 86 deletions(-)

(limited to 'src/lock-helper.c')

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
-- 
cgit v1.2.3