summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gmail.com>2011-06-11 16:03:05 -0400
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-06-14 11:29:00 +0530
commitcf9f0032e3e12803e51814640a37c5ba441e8080 (patch)
treeb46aa41c913bb38f5b629814fc11a4e6dca393a9 /gnome-base/gnome-settings-daemon/files
parentapp-portage/packagekit: 0.6.14 → 0.6.15 (diff)
downloadgnome-cf9f0032e3e12803e51814640a37c5ba441e8080.tar.gz
gnome-cf9f0032e3e12803e51814640a37c5ba441e8080.tar.bz2
gnome-cf9f0032e3e12803e51814640a37c5ba441e8080.zip
gnome-base/gnome-settings-daemon-3.0.2 : touchpad timeout, udev[extras] fix
Add short-touchpad-timeout USE flag to allow reverting to 0.5 second syndaemon timeout (like in GNOME 2) because the current 2.0 second timeout apparently severely affects touchpad usability for some people (thanks to shiznix_ on IRC for the report). See https://bugzilla.gnome.org/show_bug.cgi?id=621836 for details. Also, add a patch from upstream git fixing wacom tablet touch functionality, and update for new udev USE flags (see bug #348472). Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org>
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch13
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch32
2 files changed, 45 insertions, 0 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
new file mode 100644
index 00000000..a87a3d9b
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+index 80f664a..c9a29fb 100644
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -533,7 +533,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+
+ args[0] = "syndaemon";
+ args[1] = "-i";
+- args[2] = "2.0";
++ args[2] = "0.5";
+ args[3] = "-K";
+ args[4] = "-R";
+ args[5] = NULL;
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch
new file mode 100644
index 00000000..977b38ce
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch
@@ -0,0 +1,32 @@
+From 4248d799058f36bbb93ab9be173b249e7f631f80 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 25 May 2011 02:50:15 +0000
+Subject: wacom: enable wacom touch key by default.
+
+This was caused by a misunderstanding of the touch behaviour.
+This key enables/disables the touch part of the tablet altogether, not the
+behaviour of touch while using the pen. Hence the erroneous default, we
+really don't want to disable touch on most tablets by default.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=651020
+---
+diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+index 738b26a..4554d62 100644
+--- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+@@ -23,9 +23,9 @@
+ <_description>Set this to 'none', 'cw' for 90 degree clockwise, 'half' for 180 degree, and 'ccw' for 90 degree counterclockwise.</_description>
+ </key>
+ <key name="touch" type="b">
+- <default>false</default>
++ <default>true</default>
+ <_summary>Wacom touch feature</_summary>
+- <_description>Enable this to only move the cursor when the user touches the tablet.</_description>
++ <_description>Enable this to move the cursor when the user touches the tablet.</_description>
+ </key>
+ <key name="tablet-pc-button" type="b">
+ <default>false</default>
+--
+cgit v0.9