diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2012-04-05 17:10:23 (GMT) |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2012-04-05 17:32:19 (GMT) |
| commit | d07807ca68e7d3f0b94fdce9bc2a88a71d4324ef (patch) | |
| tree | 25b2e6ba01ec119a7a72e9b3270d324d65f15498 | |
| parent | b778aad98bf5e1acc9899e757345dcee3a5294fd (diff) | |
| download | gnome-settings-daemon-d07807ca68e7d3f0b94fdce9bc2a88a71d4324ef.zip gnome-settings-daemon-d07807ca68e7d3f0b94fdce9bc2a88a71d4324ef.tar.xz | |
gnome-settings-daemon: fix applying settings to newly added touchpads
In GTK+-3.4, touchpads no longer are classified as GDK_SOURCE_MOUSE,
they are GDK_SOURCE_TOUCHPAD, so we need to add a check for that
in the handling for newly added devices, or touchpads won't get
configured properly when returning from suspend.
Required GTK+ version is bumped to 3.3.18 for the GDK_SOURCE_TOUCHPAD
enum value.
https://bugzilla.gnome.org/show_bug.cgi?id=673595
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/mouse/gsd-mouse-manager.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9e8485b..147faa2 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ dnl - Dependencies dnl --------------------------------------------------------------------------- GLIB_REQUIRED_VERSION=2.31.0 -GTK_REQUIRED_VERSION=3.3.4 +GTK_REQUIRED_VERSION=3.3.18 GCONF_REQUIRED_VERSION=2.6.1 GIO_REQUIRED_VERSION=2.26.0 GNOME_DESKTOP_REQUIRED_VERSION=3.3.92 diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c index 9af0553..49ffb9d 100644 --- a/plugins/mouse/gsd-mouse-manager.c +++ b/plugins/mouse/gsd-mouse-manager.c @@ -1014,7 +1014,10 @@ device_added_cb (GdkDeviceManager *device_manager, GdkDevice *device, GsdMouseManager *manager) { - if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE) { + GdkInputSource source; + + source = gdk_device_get_source (device); + if (source == GDK_SOURCE_MOUSE || source == GDK_SOURCE_TOUCHPAD) { if (run_custom_command (device, COMMAND_DEVICE_ADDED) == FALSE) { set_mouse_settings (manager, device); } else { @@ -1034,7 +1037,10 @@ device_removed_cb (GdkDeviceManager *device_manager, GdkDevice *device, GsdMouseManager *manager) { - if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE) { + GdkInputSource source; + + source = gdk_device_get_source (device); + if (source == GDK_SOURCE_MOUSE || source == GDK_SOURCE_TOUCHPAD) { int id; run_custom_command (device, COMMAND_DEVICE_REMOVED); |