[gnome-power-manager] Remove the DPMS integration, it's moved to gnome-settings-daemon

[Richard Hughes <rhughes src gnome org>]

commit a8728cd117ec161dfe1513e35edf96928a7b79b8
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 25 17:02:55 2011 +0100

    Remove the DPMS integration, it's moved to gnome-settings-daemon

 src/Makefile.am     |    4 -
 src/gpm-backlight.c |   62 --------
 src/gpm-dpms.c      |  391 ---------------------------------------------------
 src/gpm-dpms.h      |   80 -----------
 src/gpm-manager.c   |  122 ----------------
 src/gpm-self-test.c |   67 +--------
 6 files changed, 7 insertions(+), 719 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 839f0ab..61f78c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,8 +78,6 @@ gnome_power_statistics_CFLAGS =				\
 	$(WARNINGFLAGS)
 
 gnome_power_manager_SOURCES =				\
-	gpm-dpms.h					\
-	gpm-dpms.c					\
 	gpm-backlight.h					\
 	gpm-backlight.c					\
 	gpm-idle.h					\
@@ -111,8 +109,6 @@ gnome_power_manager_CFLAGS =				\
 	$(WARNINGFLAGS)
 
 gnome_power_self_test_SOURCES =				\
-	gpm-dpms.h					\
-	gpm-dpms.c					\
 	gpm-idle.h					\
 	gpm-idle.c					\
 	gpm-common.h					\
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
index eeba0ac..6eefb39 100644
--- a/src/gpm-backlight.c
+++ b/src/gpm-backlight.c
@@ -44,7 +44,6 @@
 #include "gpm-backlight.h"
 #include "gpm-control.h"
 #include "gpm-common.h"
-#include "gpm-dpms.h"
 #include "gpm-idle.h"
 #include "gpm-stock-icons.h"
 #include "egg-console-kit.h"
@@ -58,7 +57,6 @@ struct GpmBacklightPrivate
 	GSettings		*settings;
 	GSettings		*settings_gsd;
 	GpmControl		*control;
-	GpmDpms			*dpms;
 	GpmIdle			*idle;
 	EggConsoleKit		*consolekit;
 	gboolean		 can_dim;
@@ -318,20 +316,11 @@ gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight)
 static void
 gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBacklight *backlight)
 {
-	gboolean ret;
-	GError *error = NULL;
 	g_debug ("Button press event type=%s", type);
 
 	if (g_strcmp0 (type, GPM_BUTTON_LID_OPEN) == 0) {
 		/* make sure we undim when we lift the lid */
 		gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-
-		/* ensure backlight is on */
-		ret = gpm_dpms_set_mode (backlight->priv->dpms, GPM_DPMS_MODE_ON, &error);
-		if (!ret) {
-			g_warning ("failed to turn on DPMS: %s", error->message);
-			g_error_free (error);
-		}
 	}
 }
 
@@ -422,59 +411,17 @@ gpm_backlight_idle_changed_cb (GpmIdle *idle, GpmIdleMode mode, GpmBacklight *ba
 		gpm_backlight_notify_system_idle_changed (backlight, FALSE);
 		gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
 
-		/* ensure backlight is on */
-		ret = gpm_dpms_set_mode (backlight->priv->dpms, GPM_DPMS_MODE_ON, &error);
-		if (!ret) {
-			g_warning ("failed to turn on DPMS: %s", error->message);
-			g_error_free (error);
-		}
-
 	} else if (mode == GPM_IDLE_MODE_DIM) {
 
 		/* sync lcd brightness */
 		gpm_backlight_notify_system_idle_changed (backlight, TRUE);
 		gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
 
-		/* ensure backlight is on */
-		ret = gpm_dpms_set_mode (backlight->priv->dpms, GPM_DPMS_MODE_ON, &error);
-		if (!ret) {
-			g_warning ("failed to turn on DPMS: %s", error->message);
-			g_error_free (error);
-		}
-
 	} else if (mode == GPM_IDLE_MODE_BLANK) {
 
 		/* sync lcd brightness */
 		gpm_backlight_notify_system_idle_changed (backlight, TRUE);
 		gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-
-		/* turn backlight off */
-		ret = gpm_dpms_set_mode (backlight->priv->dpms, GPM_DPMS_MODE_OFF, &error);
-		if (!ret) {
-			g_warning ("failed to change DPMS: %s", error->message);
-			g_error_free (error);
-		}
-	}
-}
-
-/**
- * gpm_backlight_control_resume_cb:
- * @control: The control class instance
- * @power: This power class instance
- *
- * We have to update the caches on resume
- **/
-static void
-gpm_backlight_control_resume_cb (GpmControl *control, GpmControlAction action, GpmBacklight *backlight)
-{
-	gboolean ret;
-	GError *error = NULL;
-
-	/* ensure backlight is on */
-	ret = gpm_dpms_set_mode (backlight->priv->dpms, GPM_DPMS_MODE_ON, &error);
-	if (!ret) {
-		g_warning ("failed to turn on DPMS: %s", error->message);
-		g_error_free (error);
 	}
 }
 
@@ -491,7 +438,6 @@ gpm_backlight_finalize (GObject *object)
 
 	g_timer_destroy (backlight->priv->idle_timer);
 
-	g_object_unref (backlight->priv->dpms);
 	g_object_unref (backlight->priv->control);
 	g_object_unref (backlight->priv->settings);
 	g_object_unref (backlight->priv->settings_gsd);
@@ -561,14 +507,6 @@ gpm_backlight_init (GpmBacklight *backlight)
 	backlight->priv->idle_dim_timeout = g_settings_get_int (backlight->priv->settings_gsd, GSD_SETTINGS_IDLE_DIM_TIME);
 	gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
 
-	/* DPMS mode poll class */
-	backlight->priv->dpms = gpm_dpms_new ();
-
-	/* we refresh DPMS on resume */
-	backlight->priv->control = gpm_control_new ();
-	g_signal_connect (backlight->priv->control, "resume",
-			  G_CALLBACK (gpm_backlight_control_resume_cb), backlight);
-
 	/* Don't do dimming on inactive console */
 	backlight->priv->consolekit = egg_console_kit_new ();
 
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index a1d6941..7efafbf 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -44,7 +44,6 @@
 #include "gpm-button.h"
 #include "gpm-control.h"
 #include "gpm-common.h"
-#include "gpm-dpms.h"
 #include "gpm-idle.h"
 #include "gpm-manager.h"
 #include "gpm-screensaver.h"
@@ -67,14 +66,12 @@ struct GpmManagerPrivate
 	GpmButton		*button;
 	GSettings		*settings;
 	GSettings		*settings_gsd;
-	GpmDpms			*dpms;
 	GpmIdle			*idle;
 	GpmControl		*control;
 	GpmScreensaver		*screensaver;
 	GpmBacklight		*backlight;
 	EggConsoleKit		*console;
 	guint32			 screensaver_ac_throttle_id;
-	guint32			 screensaver_dpms_throttle_id;
 	guint32			 screensaver_lid_throttle_id;
 	UpClient		*client;
 	gboolean		 on_battery;
@@ -196,7 +193,6 @@ gpm_manager_blank_screen (GpmManager *manager, GError **noerror)
 {
 	gboolean do_lock;
 	gboolean ret = TRUE;
-	GError *error = NULL;
 
 	do_lock = gpm_control_get_lock_policy (manager->priv->control,
 					       GPM_SETTINGS_LOCK_ON_BLANK_SCREEN);
@@ -204,40 +200,6 @@ gpm_manager_blank_screen (GpmManager *manager, GError **noerror)
 		if (!gpm_screensaver_lock (manager->priv->screensaver))
 			g_debug ("Could not lock screen via gnome-screensaver");
 	}
-	gpm_dpms_set_mode (manager->priv->dpms, GPM_DPMS_MODE_OFF, &error);
-	if (error) {
-		g_debug ("Unable to set DPMS mode: %s", error->message);
-		g_error_free (error);
-		ret = FALSE;
-	}
-	return ret;
-}
-
-/**
- * gpm_manager_unblank_screen:
- * @manager: This class instance
- *
- * Unblank the screen after we have opened the lid of the laptop
- *
- * Return value: Success.
- **/
-static gboolean
-gpm_manager_unblank_screen (GpmManager *manager, GError **noerror)
-{
-	gboolean do_lock;
-	gboolean ret = TRUE;
-	GError *error = NULL;
-
-	gpm_dpms_set_mode (manager->priv->dpms, GPM_DPMS_MODE_ON, &error);
-	if (error) {
-		g_debug ("Unable to set DPMS mode: %s", error->message);
-		g_error_free (error);
-		ret = FALSE;
-	}
-
-	do_lock = gpm_control_get_lock_policy (manager->priv->control, GPM_SETTINGS_LOCK_ON_BLANK_SCREEN);
-	if (do_lock)
-		gpm_screensaver_poke (manager->priv->screensaver);
 	return ret;
 }
 
@@ -594,33 +556,6 @@ gpm_manager_idle_changed_cb (GpmIdle *idle, GpmIdleMode mode, GpmManager *manage
 static void
 gpm_manager_lid_button_pressed (GpmManager *manager, gboolean pressed)
 {
-	/* we turn the lid dpms back on unconditionally */
-	if (pressed == FALSE) {
-		gpm_manager_unblank_screen (manager, NULL);
-		return;
-	}
-}
-
-static void
-gpm_manager_update_dpms_throttle (GpmManager *manager)
-{
-	GpmDpmsMode mode;
-	gpm_dpms_get_mode (manager->priv->dpms, &mode, NULL);
-
-	/* Throttle the manager when DPMS is active since we can't see it anyway */
-	if (mode == GPM_DPMS_MODE_ON) {
-		if (manager->priv->screensaver_dpms_throttle_id != 0) {
-			gpm_screensaver_remove_throttle (manager->priv->screensaver, manager->priv->screensaver_dpms_throttle_id);
-			manager->priv->screensaver_dpms_throttle_id = 0;
-		}
-	} else {
-		/* if throttle already exists then remove */
-		if (manager->priv->screensaver_dpms_throttle_id != 0) {
-			gpm_screensaver_remove_throttle (manager->priv->screensaver, manager->priv->screensaver_dpms_throttle_id);
-		}
-		/* TRANSLATORS: this is the gnome-screensaver throttle */
-		manager->priv->screensaver_dpms_throttle_id = gpm_screensaver_add_throttle (manager->priv->screensaver, _("Display DPMS activated"));
-	}
 }
 
 static void
@@ -770,33 +705,6 @@ gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManag
 
 #if 0
 /**
- * gpm_manager_screensaver_auth_request_cb:
- * @manager: This manager class instance
- * @auth: If we are trying to authenticate
- *
- * Called when the user is trying or has authenticated
- **/
-static void
-gpm_manager_screensaver_auth_request_cb (GpmScreensaver *screensaver, gboolean auth_begin, GpmManager *manager)
-{
-	GError *error = NULL;
-
-	if (auth_begin) {
-		/* We turn on the monitor unconditionally, as we may be using
-		 * a smartcard to authenticate and DPMS might still be on.
-		 * See #350291 for more details */
-		gpm_dpms_set_mode (manager->priv->dpms, GPM_DPMS_MODE_ON, &error);
-		if (error != NULL) {
-			g_warning ("Failed to turn on DPMS: %s", error->message);
-			g_error_free (error);
-			error = NULL;
-		}
-	}
-}
-#endif
-
-#if 0
-/**
  * gpm_manager_perhaps_recall_response_cb:
  */
 static void
@@ -911,30 +819,6 @@ out:
 #endif
 
 /**
- * gpm_manager_dpms_mode_changed_cb:
- * @mode: The DPMS mode, e.g. GPM_DPMS_MODE_OFF
- * @info: This class instance
- *
- * Log when the DPMS mode is changed.
- **/
-static void
-gpm_manager_dpms_mode_changed_cb (GpmDpms *dpms, GpmDpmsMode mode, GpmManager *manager)
-{
-	g_debug ("DPMS mode changed: %d", mode);
-
-	if (mode == GPM_DPMS_MODE_ON)
-		g_debug ("dpms on");
-	else if (mode == GPM_DPMS_MODE_STANDBY)
-		g_debug ("dpms standby");
-	else if (mode == GPM_DPMS_MODE_SUSPEND)
-		g_debug ("suspend");
-	else if (mode == GPM_DPMS_MODE_OFF)
-		g_debug ("dpms off");
-
-	gpm_manager_update_dpms_throttle (manager);
-}
-
-/**
  * gpm_manager_reset_just_resumed_cb:
  **/
 static gboolean
@@ -975,7 +859,6 @@ gpm_manager_init (GpmManager *manager)
 
 	/* init to unthrottled */
 	manager->priv->screensaver_ac_throttle_id = 0;
-	manager->priv->screensaver_dpms_throttle_id = 0;
 	manager->priv->screensaver_lid_throttle_id = 0;
 
 	/* init to not just_resumed */
@@ -1016,10 +899,6 @@ gpm_manager_init (GpmManager *manager)
 	g_signal_connect (manager->priv->idle, "idle-changed",
 			  G_CALLBACK (gpm_manager_idle_changed_cb), manager);
 
-	manager->priv->dpms = gpm_dpms_new ();
-	g_signal_connect (manager->priv->dpms, "mode-changed",
-			  G_CALLBACK (gpm_manager_dpms_mode_changed_cb), manager);
-
 	/* use the control object */
 	g_debug ("creating new control instance");
 	manager->priv->control = gpm_control_new ();
@@ -1155,7 +1034,6 @@ gpm_manager_finalize (GObject *object)
 
 	g_object_unref (manager->priv->settings);
 	g_object_unref (manager->priv->settings_gsd);
-	g_object_unref (manager->priv->dpms);
 	g_object_unref (manager->priv->idle);
 	g_object_unref (manager->priv->screensaver);
 	g_object_unref (manager->priv->control);
diff --git a/src/gpm-self-test.c b/src/gpm-self-test.c
index 04c81ca..99bba40 100644
--- a/src/gpm-self-test.c
+++ b/src/gpm-self-test.c
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 
 #include "gpm-screensaver.h"
-#include "gpm-dpms.h"
 #include "gpm-idle.h"
 #include "gpm-common.h"
 #include "gpm-idletime.h"
@@ -100,54 +99,6 @@ _g_test_loop_quit (void)
 
 /**********************************************************************/
 
-static void
-gpm_test_dpms_func (void)
-{
-	GpmDpms *dpms;
-	gboolean ret;
-	GError *error = NULL;
-
-	dpms = gpm_dpms_new ();
-	g_assert (dpms != NULL);
-
-	/* set on */
-	ret = gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_ON, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	g_usleep (2*1000*1000);
-
-	/* set STANDBY */
-	ret = gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_STANDBY, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	g_usleep (2*1000*1000);
-
-	/* set SUSPEND */
-	ret = gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_SUSPEND, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	g_usleep (2*1000*1000);
-
-	/* set OFF */
-	ret = gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_OFF, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	g_usleep (2*1000*1000);
-
-	/* set on */
-	ret = gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_ON, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	g_usleep (2*1000*1000);
-
-	g_object_unref (dpms);
-}
-
 static GpmIdleMode _mode = 0;
 
 static void
@@ -162,8 +113,8 @@ static void
 gpm_test_idle_func (void)
 {
 	GpmIdle *idle;
-	gboolean ret;
-	GpmDpms *dpms;
+//	gboolean ret;
+//	GpmDpms *dpms;
 
 	idle = gpm_idle_new ();
 	g_assert (idle != NULL);
@@ -222,9 +173,9 @@ gpm_test_idle_func (void)
 	g_assert_cmpint (gpm_idle_get_mode (idle), ==, GPM_IDLE_MODE_BLANK);
 
 	/* set dpms off */
-	dpms = gpm_dpms_new ();
-	ret = gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_OFF, NULL);
-	g_assert (ret);
+//	dpms = gpm_dpms_new ();
+//	ret = gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_OFF, NULL);
+//	g_assert (ret);
 
 	/* wait for normal event to be suppressed */
 //	g_timeout_add (2000, (GSourceFunc) gpm_test_idle_func_delay_cb, NULL);
@@ -233,10 +184,10 @@ gpm_test_idle_func (void)
 	/* check current mode */
 	g_assert_cmpint (gpm_idle_get_mode (idle), ==, GPM_IDLE_MODE_BLANK);
 
-	gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_ON, NULL);
+//	gpm_dpms_set_mode (dpms, GPM_DPMS_MODE_ON, NULL);
 
 	g_object_unref (idle);
-	g_object_unref (dpms);
+//	g_object_unref (dpms);
 }
 
 static void
@@ -769,9 +720,6 @@ main (int argc, char **argv)
 	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
-	/* needed for DPMS checks */
-	gtk_init (&argc, &argv);
-
 	/* tests go here */
 	g_test_add_func ("/power/precision", gpm_test_precision_func);
 	g_test_add_func ("/power/discrete", gpm_test_discrete_func);
@@ -779,7 +727,6 @@ main (int argc, char **argv)
 	g_test_add_func ("/power/array_float", gpm_test_array_float_func);
 	g_test_add_func ("/power/idle", gpm_test_idle_func);
 	g_test_add_func ("/power/idletime", gpm_test_idletime_func);
-	g_test_add_func ("/power/dpms", gpm_test_dpms_func);
 	g_test_add_func ("/power/screensaver", gpm_test_screensaver_func);
 
 	return g_test_run ();