|
0 |
From d07807ca68e7d3f0b94fdce9bc2a88a71d4324ef Mon Sep 17 00:00:00 2001
|
|
1 |
From: Owen W. Taylor <otaylor@fishsoup.net>
|
|
2 |
Date: Thu, 05 Apr 2012 17:10:23 +0000
|
|
3 |
Subject: gnome-settings-daemon: fix applying settings to newly added touchpads
|
|
4 |
|
|
5 |
In GTK+-3.4, touchpads no longer are classified as GDK_SOURCE_MOUSE,
|
|
6 |
they are GDK_SOURCE_TOUCHPAD, so we need to add a check for that
|
|
7 |
in the handling for newly added devices, or touchpads won't get
|
|
8 |
configured properly when returning from suspend.
|
|
9 |
|
|
10 |
Required GTK+ version is bumped to 3.3.18 for the GDK_SOURCE_TOUCHPAD
|
|
11 |
enum value.
|
|
12 |
|
|
13 |
https://bugzilla.gnome.org/show_bug.cgi?id=673595
|
|
14 |
--- gnome-settings-daemon-3.4.0.orig/configure.ac 2012-04-10 22:45:42.200069290 +0200
|
|
15 |
+++ gnome-settings-daemon-3.4.0/configure.ac 2012-04-10 22:45:42.340069297 +0200
|
|
16 |
@@ -44,7 +44,7 @@
|
|
17 |
dnl ---------------------------------------------------------------------------
|
|
18 |
|
|
19 |
GLIB_REQUIRED_VERSION=2.31.0
|
|
20 |
-GTK_REQUIRED_VERSION=3.3.4
|
|
21 |
+GTK_REQUIRED_VERSION=3.3.18
|
|
22 |
GCONF_REQUIRED_VERSION=2.6.1
|
|
23 |
GIO_REQUIRED_VERSION=2.26.0
|
|
24 |
GNOME_DESKTOP_REQUIRED_VERSION=3.3.92
|
|
25 |
--- gnome-settings-daemon-3.4.0.orig/plugins/mouse/gsd-mouse-manager.c 2012-04-10 22:45:42.104069286 +0200
|
|
26 |
+++ gnome-settings-daemon-3.4.0/plugins/mouse/gsd-mouse-manager.c 2012-04-10 22:45:42.344069297 +0200
|
|
27 |
@@ -1019,7 +1019,10 @@
|
|
28 |
GdkDevice *device,
|
|
29 |
GsdMouseManager *manager)
|
|
30 |
{
|
|
31 |
- if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE) {
|
|
32 |
+ GdkInputSource source;
|
|
33 |
+
|
|
34 |
+ source = gdk_device_get_source (device);
|
|
35 |
+ if (source == GDK_SOURCE_MOUSE || source == GDK_SOURCE_TOUCHPAD) {
|
|
36 |
if (run_custom_command (device, COMMAND_DEVICE_ADDED) == FALSE) {
|
|
37 |
set_mouse_settings (manager, device);
|
|
38 |
} else {
|
|
39 |
@@ -1039,7 +1042,10 @@
|
|
40 |
GdkDevice *device,
|
|
41 |
GsdMouseManager *manager)
|
|
42 |
{
|
|
43 |
- if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE) {
|
|
44 |
+ GdkInputSource source;
|
|
45 |
+
|
|
46 |
+ source = gdk_device_get_source (device);
|
|
47 |
+ if (source == GDK_SOURCE_MOUSE || source == GDK_SOURCE_TOUCHPAD) {
|
|
48 |
int id;
|
|
49 |
|
|
50 |
run_custom_command (device, COMMAND_DEVICE_REMOVED);
|