diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2018-04-20 19:59:23 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2018-12-06 16:53:17 +0100 |
commit | 104c5e603efe52b51dd1d392a2d6fb32142770bc (patch) | |
tree | 7f7bcb002505fc4a4b85bd1ca2f60ad3302603d7 /plugins/power/gsd-power-manager.c | |
parent | aa2cd162bfee52b92624ad7f916247e59941cf40 (diff) | |
download | gnome-settings-daemon-104c5e603efe52b51dd1d392a2d6fb32142770bc.tar.gz |
power: Remove code that enables/disables touchscreens
This functionality is being taken over by mutter.
Diffstat (limited to 'plugins/power/gsd-power-manager.c')
-rw-r--r-- | plugins/power/gsd-power-manager.c | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c index 6093f119..a0136051 100644 --- a/plugins/power/gsd-power-manager.c +++ b/plugins/power/gsd-power-manager.c @@ -986,61 +986,6 @@ action_hibernate (GsdPowerManager *manager) } static void -screen_devices_disable (GsdPowerManager *manager) -{ - GdkDeviceManager *device_manager; - GList *devices, *l; - - /* This will be managed by the compositor eventually on X11 too: - * https://bugzilla.gnome.org/show_bug.cgi?id=742598 - */ - if (gnome_settings_is_wayland ()) - return; - - device_manager = gdk_display_get_device_manager (gdk_display_get_default ()); - devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE); - for (l = devices; l != NULL; l = l->next ) { - GdkDevice *device = l->data; - GdkInputSource source; - - source = gdk_device_get_source (device); - - if (source == GDK_SOURCE_PEN || - source == GDK_SOURCE_ERASER || - source == GDK_SOURCE_TOUCHSCREEN) { - int device_id; - - g_object_get (device, "device-id", &device_id, NULL); - g_hash_table_insert (manager->priv->disabled_devices, - GINT_TO_POINTER (device_id), - GINT_TO_POINTER (TRUE)); - } - } - g_list_free (devices); - - devices = g_hash_table_get_keys (manager->priv->disabled_devices); - for (l = devices; l != NULL; l = l->next) - set_device_enabled (GPOINTER_TO_INT (l->data), FALSE); - g_list_free (devices); -} - -static void -screen_devices_enable (GsdPowerManager *manager) -{ - GList *l, *disabled_devices; - - if (gnome_settings_is_wayland ()) - return; - - disabled_devices = g_hash_table_get_keys (manager->priv->disabled_devices); - for (l = disabled_devices; l != NULL; l = l->next) - set_device_enabled (GPOINTER_TO_INT (l->data), TRUE); - g_list_free (disabled_devices); - - g_hash_table_remove_all (manager->priv->disabled_devices); -} - -static void iio_proxy_claim_light (GsdPowerManager *manager, gboolean active) { GError *error = NULL; @@ -1094,8 +1039,6 @@ backlight_enable (GsdPowerManager *manager) g_error_free (error); } - screen_devices_enable (manager); - g_debug ("TESTSUITE: Unblanked screen"); } @@ -1118,8 +1061,6 @@ backlight_disable (GsdPowerManager *manager) g_debug("Is tablet: %d", manager->priv->is_tablet); if (manager->priv->is_tablet) action_suspend (manager); - else - screen_devices_disable (manager); g_debug ("TESTSUITE: Blanked screen"); } @@ -2726,8 +2667,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) { g_debug ("Stopping power manager"); - screen_devices_enable (manager); - if (manager->priv->inhibit_lid_switch_timer_id != 0) { g_source_remove (manager->priv->inhibit_lid_switch_timer_id); manager->priv->inhibit_lid_switch_timer_id = 0; |