summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2018-03-21 12:20:28 +0100
committerBastien Nocera <hadess@hadess.net>2018-05-03 17:30:11 +0200
commit06eb39d087d722dd274c9954485cfb404c1c992f (patch)
treefa249a520510c10ab679b524b87601fd3117d8fc
parent7d7d9a59b9e53fdb390b7c96ba34451c751611bd (diff)
downloadgnome-settings-daemon-06eb39d087d722dd274c9954485cfb404c1c992f.tar.gz
power: Remove X11-specific idle time reset code
It's now implemented in mutter itself. See https://bugzilla.gnome.org/show_bug.cgi?id=705942 https://bugzilla.gnome.org/show_bug.cgi?id=794563
-rw-r--r--plugins/power/gpm-common.c19
-rw-r--r--plugins/power/gsd-power-manager.c8
2 files changed, 0 insertions, 27 deletions
diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
index 97b104ac..e83f1549 100644
--- a/plugins/power/gpm-common.c
+++ b/plugins/power/gpm-common.c
@@ -28,7 +28,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkx.h>
-#include <X11/extensions/XTest.h>
#include <X11/extensions/dpms.h>
#include <canberra-gtk.h>
@@ -829,24 +828,6 @@ backlight_set_abs (GnomeRRScreen *rr_screen,
#endif
}
-void
-reset_idletime (void)
-{
- static KeyCode keycode;
-
- if (keycode == 0) {
- keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_KEY_WakeUp);
- if (keycode == 0)
- keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_KEY_Alt_L);
- }
-
- gdk_error_trap_push ();
- /* send a wakeup or left alt key; first press, then release */
- XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), keycode, True, CurrentTime);
- XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), keycode, False, CurrentTime);
- gdk_error_trap_pop_ignored ();
-}
-
static gboolean
randr_output_is_on (GnomeRROutput *output)
{
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index b318ee7f..67d475cf 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -1304,10 +1304,6 @@ do_lid_open_action (GsdPowerManager *manager)
/* TRANSLATORS: this is the sound description */
CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
NULL);
-
- /* This might already have happened when resuming, but
- * if we didn't sleep, we'll need to wake it up */
- reset_idletime ();
}
static void
@@ -2442,10 +2438,6 @@ handle_resume_actions (GsdPowerManager *manager)
/* ensure we turn the panel back on after resume */
backlight_enable (manager);
- /* And work-around Xorg bug:
- * https://bugs.freedesktop.org/show_bug.cgi?id=59576 */
- reset_idletime ();
-
/* set up the delay again */
inhibit_suspend (manager);
}