Merge lp:~larsu/unity-settings-daemon/allow-disabling-touchpad into lp:unity-settings-daemon

Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4087
Merged at revision: 4087
Proposed branch: lp:~larsu/unity-settings-daemon/allow-disabling-touchpad
Merge into: lp:unity-settings-daemon
Diff against target: 12 lines (+2/-1)
1 file modified
plugins/mouse/gsd-mouse-manager.c (+2/-1)
To merge this branch: bzr merge lp:~larsu/unity-settings-daemon/allow-disabling-touchpad
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email:

Commit message

mouse: allow force-disabling touchpad

The mouse plugin currently makes sure that at least one pointing device is present. When the last external device is unplugged, it enables the touchpad (if present). However, that logic also enables the touchpad when it itself is "unplugged", for example by a hardware switch.

Fix this by not enabling the touchpad if that was the device that was just removed.

Description of the change

mouse: allow force-disabling touchpad

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Makes sense.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/mouse/gsd-mouse-manager.c'
2--- plugins/mouse/gsd-mouse-manager.c 2013-12-04 23:55:26 +0000
3+++ plugins/mouse/gsd-mouse-manager.c 2015-07-11 10:56:45 +0000
4@@ -1193,7 +1193,8 @@
5 /* If a touchpad was to disappear... */
6 set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_DISABLE_W_TYPING));
8- ensure_touchpad_active (manager);
9+ if (gdk_device_get_source (device) != GDK_SOURCE_TOUCHPAD)
10+ ensure_touchpad_active (manager);
11 }
12 }


People subscribed via source and target branches