Merge lp:~jderose/ubuntu/saucy/gnome-settings-daemon/tune-syndaemon2 into lp:ubuntu/saucy/gnome-settings-daemon

[Jason Gerard DeRose]

See https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1215463

On a modern laptop with a large touchpad/clickpad, your palms tend to brush the touch surface as you type. The problem is that on Ubuntu, this creates an annoying amount of cursor wiggle. Competing platforms don't have this problem, so this needs to be improved on Ubuntu.

Part of the problem is the is that `xserver-xorg-input-synaptics` driver doesn't do effective palm detection (it seems), and part of the problem is that `gnome-settings-daemon` launches `syndaemon` such that it *never* disables cursor movement.

Currently syndaemon is launched like this:

  syndaemon -i 1.0 -t -K -R

The "-t" option tells syndaemon to never block cursor movement. It will only block accidental vertical scrolling (which is darn near impossible to do on a modern system with two finger scrolling), and block accidental tap-to-click (which seems unlikely something you can do by mistake with your palms). So from a user perspective, "Disable while typing" currently does nothing.

I'm proposing that syndaemon instead be launched like this:

  syndaemon -i 0.5 -K -R

Without the "-t" option, syndaemon will block cursor movement, vertical scrolling, and tap-to-click. And the "-i 0.5" means it will block it for 500ms (half a second).

System76 has been shipping a patched `gnome-settings-daemon` (Raring) on all our products for the last two months, and we've received no support issues about it (if this caused noticeable usability issues, I'm confident we'd have heard about it).

We've also done a lot of testing and tuning on the timeout threshold, and 500ms seems like about the sweet spot. It's long enough to be decently effective for most typists, but not so long that the user will catch the trackpad still disabled when they move from typing back to "cursoring" :P

Note that this isn't a prefect solution, and you really can't do this especially well with a static timeout anyway (would be better to be dynamic based on typing speed). For slow typists, 500ms often isn't long enough. But for now, I feel it's better to find that sweet spot where it at least gives some improvement for most users, without causing any negative impact for any users.

[Jason Gerard DeRose (jderose)]

Question: as far as I know, you're supposed to add changes in the .pc directory for UDD workflow. Just wanted to double check as this diff looks like such a mess :)

[Luke Yelavich (themuso)]

Given this is the upstrea default, I wonder whether its worth discussing it upstream. WHilst this is a trivial patch, it is yet another patch that Ubuntu has to carry, and we already carry a lot of patches against this package.

I suggest filing a bug upstream and discussing the desire to remove the -t flag, and indeed discuss why upstream decided to use the -t flag in the first place.

review: Needs Information

[Jason Gerard DeRose (jderose)]

Thanks for the feedback, Luke!

Yes, I plan on discussing this upstream, but I'd first like to get consensus from Ubuntu on this change, as it doesn't help System76 if the change is accepted upstream but Ubuntu disagrees with it.

Also as Ubuntu isn't tracking the upstream gnome-settings-daemon releases closely anymore, it will likely take more than one full cycle by the time the change would land in Ubuntu. Based on the current pattern, if we got this change accepted into gnome-settings-daemon 3.10, it wouldn't land in Ubuntu till Ubuntu 14.10.

For what it's worth, it would really help System76 if this change could be accepted into Saucy, as then we don't have to maintained a patched version in our PPA.

[lp:~jderose/ubuntu/saucy/gnome-settings-daemon/tune-syndaemon2]

254. By Jason Gerard DeRose on 2013-08-26

Merged 3.6.4-0ubuntu17 from lp:ubuntu/saucy/gnome-settings-daemon

255. By Jason Gerard DeRose on 2013-08-26

Added 3.6.4-0ubuntu18 entry in changelog

256. By Jason Gerard DeRose on 2013-08-26

Added DEP-3 headers to tune-syndaemon.patch

257. By Jason Gerard DeRose on 2013-08-26

Clearer

258. By Jason Gerard DeRose on 2013-08-29

Merged from 3.6.4-0ubuntu19 lp:ubuntu/saucy/gnome-settings-daemon

259. By Jason Gerard DeRose on 2013-08-29

Add changelog entry for 3.6.4-0ubuntu20

[Doug McMahon (mc3man)]

hope you all aren't going around in circles on this
The current settings are the result of this bug, caused when g-s-d went to 2 sec
https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/801763

That resulted in this bug, maybe others
https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/962958

And the current settings from
https://bugzilla.gnome.org/show_bug.cgi?id=673055

Unmerged revisions

259. By Jason Gerard DeRose on 2013-08-29

Add changelog entry for 3.6.4-0ubuntu20

258. By Jason Gerard DeRose on 2013-08-29

Merged from 3.6.4-0ubuntu19 lp:ubuntu/saucy/gnome-settings-daemon

257. By Jason Gerard DeRose on 2013-08-26

Clearer

256. By Jason Gerard DeRose on 2013-08-26

Added DEP-3 headers to tune-syndaemon.patch

255. By Jason Gerard DeRose on 2013-08-26

Added 3.6.4-0ubuntu18 entry in changelog

254. By Jason Gerard DeRose on 2013-08-26

Merged 3.6.4-0ubuntu17 from lp:ubuntu/saucy/gnome-settings-daemon

253. By Jason Gerard DeRose on 2013-08-21

Updated changelog

252. By Jason Gerard DeRose on 2013-08-21

Added tune-syndaemon.patch so that syndaemon is called with '-i 0.5 -K -R'

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-08-29 16:10:41 +0000
+++ .pc/applied-patches	2013-08-29 18:58:42 +0000
@@ -31,3 +31,4 @@
 git_keyboard_Adapt_to_gnome_xkb_info_API_change.patch
 git_keyboard_Adapt_to_gnome_xkb_info_API_change_2.patch
 git_keybindings_add_screen_reader_toggle.patch
+tune-syndaemon.patch

=== added directory '.pc/git_keybindings_add_screen_reader_toggle.patch'
=== removed directory '.pc/git_keybindings_add_screen_reader_toggle.patch'
=== added directory '.pc/git_keybindings_add_screen_reader_toggle.patch/data'
=== removed directory '.pc/git_keybindings_add_screen_reader_toggle.patch/data'
=== added file '.pc/git_keybindings_add_screen_reader_toggle.patch/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in'
--- .pc/git_keybindings_add_screen_reader_toggle.patch/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ .pc/git_keybindings_add_screen_reader_toggle.patch/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-08-29 18:58:42 +0000
@@ -0,0 +1,212 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys" path="/org/gnome/settings-daemon/plugins/media-keys/">
+     <key name="active" type="b">
+      <default>true</default>
+      <_summary>Activation of this plugin</_summary>
+      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
+    </key>
+    <key name="custom-keybindings" type="as">
+      <default>[]</default>
+      <_summary>Custom keybindings</_summary>
+      <_description>List of custom keybindings</_description>
+    </key>
+    <key name="calculator" type="s">
+      <default>'XF86Calculator'</default>
+      <_summary>Launch calculator</_summary>
+      <_description>Binding to launch the calculator.</_description>
+    </key>
+    <key name="email" type="s">
+      <default>'XF86Mail'</default>
+      <_summary>Launch email client</_summary>
+      <_description>Binding to launch the email client.</_description>
+    </key>
+    <key name="eject" type="s">
+      <default>'XF86Eject'</default>
+      <_summary>Eject</_summary>
+      <_description>Binding to eject an optical disc.</_description>
+    </key>
+    <key name="help" type="s">
+      <default>''</default>
+      <_summary>Launch help browser</_summary>
+      <_description>Binding to launch the help browser.</_description>
+    </key>
+    <key name="home" type="s">
+      <default>'XF86Explorer'</default>
+      <_summary>Home folder</_summary>
+      <_description>Binding to open the Home folder.</_description>
+    </key>
+    <key name="media" type="s">
+      <default>'XF86AudioMedia'</default>
+      <_summary>Launch media player</_summary>
+      <_description>Binding to launch the media player.</_description>
+    </key>
+    <key name="next" type="s">
+      <default>'XF86AudioNext'</default>
+      <_summary>Next track</_summary>
+      <_description>Binding to skip to next track.</_description>
+    </key>
+    <key name="pause" type="s">
+      <default>'XF86AudioPause'</default>
+      <_summary>Pause playback</_summary>
+      <_description>Binding to pause playback.</_description>
+    </key>
+    <key name="play" type="s">
+      <default>'XF86AudioPlay'</default>
+      <_summary>Play (or play/pause)</_summary>
+      <_description>Binding to start playback (or toggle play/pause).</_description>
+    </key>
+    <key name="logout" type="s">
+      <default>'&lt;Control&gt;&lt;Alt&gt;Delete'</default>
+      <_summary>Log out</_summary>
+      <_description>Binding to log out.</_description>
+    </key>
+    <key name="previous" type="s">
+      <default>'XF86AudioPrev'</default>
+      <_summary>Previous track</_summary>
+      <_description>Binding to skip to previous track.</_description>
+    </key>
+    <key name="priority" type="i">
+      <default>98</default>
+      <_summary>Priority to use for this plugin</_summary>
+      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
+    </key>
+    <key name="screensaver" type="s">
+      <default>'&lt;Control&gt;&lt;Alt&gt;l'</default>
+      <_summary>Lock screen</_summary>
+      <_description>Binding to lock the screen.</_description>
+    </key>
+    <key name="search" type="s">
+      <default>'XF86Search'</default>
+      <_summary>Search</_summary>
+      <_description>Binding to launch the search tool.</_description>
+    </key>
+    <key name="stop" type="s">
+      <default>'XF86AudioStop'</default>
+      <_summary>Stop playback</_summary>
+      <_description>Binding to stop playback.</_description>
+    </key>
+    <key name="volume-down" type="s">
+      <default>'XF86AudioLowerVolume'</default>
+      <_summary>Volume down</_summary>
+      <_description>Binding to lower the system volume.</_description>
+    </key>
+    <key name="volume-mute" type="s">
+      <default>'XF86AudioMute'</default>
+      <_summary>Volume mute</_summary>
+      <_description>Binding to mute the system volume.</_description>
+    </key>
+    <key name="volume-up" type="s">
+      <default>'XF86AudioRaiseVolume'</default>
+      <_summary>Volume up</_summary>
+      <_description>Binding to raise the system volume.</_description>
+    </key>
+    <key name="screenshot" type="s">
+      <default>'Print'</default>
+      <_summary>Take a screenshot</_summary>
+      <_description>Binding to take a screenshot.</_description>
+    </key>
+    <key name="window-screenshot" type="s">
+      <default>'&lt;Alt&gt;Print'</default>
+      <_summary>Take a screenshot of a window</_summary>
+      <_description>Binding to take a screenshot of a window.</_description>
+    </key>
+    <key name="area-screenshot" type="s">
+      <default>'&lt;Shift&gt;Print'</default>
+      <_summary>Take a screenshot of an area</_summary>
+      <_description>Binding to take a screenshot of an area.</_description>
+    </key>
+    <key name="screenshot-clip" type="s">
+      <default>'&lt;Ctrl&gt;Print'</default>
+      <_summary>Copy a screenshot to clipboard</_summary>
+      <_description>Binding to copy a screenshot to clipboard.</_description>
+    </key>
+    <key name="window-screenshot-clip" type="s">
+      <default>'&lt;Ctrl&gt;&lt;Alt&gt;Print'</default>
+      <_summary>Copy a screenshot of a window to clipboard</_summary>
+      <_description>Binding to copy a screenshot of a window to clipboard.</_description>
+    </key>
+    <key name="area-screenshot-clip" type="s">
+      <default>'&lt;Ctrl&gt;&lt;Shift&gt;Print'</default>
+      <_summary>Copy a screenshot of an area to clipboard</_summary>
+      <_description>Binding to copy a screenshot of an area to clipboard.</_description>
+    </key>
+    <key name="terminal" type="s">
+      <default>'&lt;Primary&gt;&lt;Alt&gt;t'</default>
+      <_summary>Launch terminal</_summary>
+      <_description>Binding to launch the terminal.</_description>
+    </key>
+    <key name="www" type="s">
+      <default>'XF86WWW'</default>
+      <_summary>Launch web browser</_summary>
+      <_description>Binding to launch the web browser.</_description>
+    </key>
+    <key name="magnifier" type="s">
+      <default>'&lt;Alt&gt;&lt;Super&gt;8'</default>
+      <_summary>Toggle magnifier</_summary>
+      <_description>Binding to show the screen magnifier</_description>
+    </key>
+    <key name="screenreader" type="s">
+      <default>''</default>
+      <_summary>Toggle screen reader</_summary>
+      <_description>Binding to start the screen reader</_description>
+    </key>
+    <key name="on-screen-keyboard" type="s">
+      <default>''</default>
+      <_summary>Toggle on-screen keyboard</_summary>
+      <_description>Binding to show the on-screen keyboard</_description>
+    </key>
+    <key name="increase-text-size" type="s">
+      <default>''</default>
+      <_summary>Increase text size</_summary>
+      <_description>Binding to increase the text size</_description>
+    </key>
+    <key name="decrease-text-size" type="s">
+      <default>''</default>
+      <_summary>Decrease text size</_summary>
+      <_description>Binding to decrease the text size</_description>
+    </key>
+    <key name="toggle-contrast" type="s">
+      <default>''</default>
+      <_summary>Toggle contrast</_summary>
+      <_description>Binding to toggle the interface contrast</_description>
+    </key>
+    <key name="magnifier-zoom-in" type="s">
+      <default>'&lt;Alt&gt;&lt;Super&gt;equal'</default>
+      <_summary>Magnifier zoom in</_summary>
+      <_description>Binding for the magnifier to zoom in</_description>
+    </key>
+    <key name="magnifier-zoom-out" type="s">
+      <default>'&lt;Alt&gt;&lt;Super&gt;minus'</default>
+      <_summary>Magnifier zoom out</_summary>
+      <_description>Binding for the magnifier to zoom out</_description>
+    </key>
+    <key name="switch-input-source" type="s">
+      <default>''</default>
+      <_summary>Switch input source</_summary>
+      <_description>Binding to select the next input source</_description>
+    </key>
+    <key name="switch-input-source-backward" type="s">
+      <default>''</default>
+      <_summary>Switch input source backward</_summary>
+      <_description>Binding to select the previous input source</_description>
+    </key>
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">
+    <key name="name" type="s">
+      <default>''</default>
+      <_summary>Name</_summary>
+      <_description>Name of the custom binding</_description>
+    </key>
+    <key name="binding" type="s">
+      <default>''</default>
+      <_summary>Binding</_summary>
+      <_description>Binding for the custom binding</_description>
+    </key>
+    <key name="command" type="s">
+      <default>''</default>
+      <_summary>Command</_summary>
+      <_description>Command to run when the binding is invoked</_description>
+    </key>
+  </schema>
+</schemalist>

=== removed file '.pc/git_keybindings_add_screen_reader_toggle.patch/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in'
--- .pc/git_keybindings_add_screen_reader_toggle.patch/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-08-23 16:08:29 +0000
+++ .pc/git_keybindings_add_screen_reader_toggle.patch/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	1970-01-01 00:00:00 +0000
@@ -1,212 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys" path="/org/gnome/settings-daemon/plugins/media-keys/">
-     <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
-    <key name="custom-keybindings" type="as">
-      <default>[]</default>
-      <_summary>Custom keybindings</_summary>
-      <_description>List of custom keybindings</_description>
-    </key>
-    <key name="calculator" type="s">
-      <default>'XF86Calculator'</default>
-      <_summary>Launch calculator</_summary>
-      <_description>Binding to launch the calculator.</_description>
-    </key>
-    <key name="email" type="s">
-      <default>'XF86Mail'</default>
-      <_summary>Launch email client</_summary>
-      <_description>Binding to launch the email client.</_description>
-    </key>
-    <key name="eject" type="s">
-      <default>'XF86Eject'</default>
-      <_summary>Eject</_summary>
-      <_description>Binding to eject an optical disc.</_description>
-    </key>
-    <key name="help" type="s">
-      <default>''</default>
-      <_summary>Launch help browser</_summary>
-      <_description>Binding to launch the help browser.</_description>
-    </key>
-    <key name="home" type="s">
-      <default>'XF86Explorer'</default>
-      <_summary>Home folder</_summary>
-      <_description>Binding to open the Home folder.</_description>
-    </key>
-    <key name="media" type="s">
-      <default>'XF86AudioMedia'</default>
-      <_summary>Launch media player</_summary>
-      <_description>Binding to launch the media player.</_description>
-    </key>
-    <key name="next" type="s">
-      <default>'XF86AudioNext'</default>
-      <_summary>Next track</_summary>
-      <_description>Binding to skip to next track.</_description>
-    </key>
-    <key name="pause" type="s">
-      <default>'XF86AudioPause'</default>
-      <_summary>Pause playback</_summary>
-      <_description>Binding to pause playback.</_description>
-    </key>
-    <key name="play" type="s">
-      <default>'XF86AudioPlay'</default>
-      <_summary>Play (or play/pause)</_summary>
-      <_description>Binding to start playback (or toggle play/pause).</_description>
-    </key>
-    <key name="logout" type="s">
-      <default>'&lt;Control&gt;&lt;Alt&gt;Delete'</default>
-      <_summary>Log out</_summary>
-      <_description>Binding to log out.</_description>
-    </key>
-    <key name="previous" type="s">
-      <default>'XF86AudioPrev'</default>
-      <_summary>Previous track</_summary>
-      <_description>Binding to skip to previous track.</_description>
-    </key>
-    <key name="priority" type="i">
-      <default>98</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
-    </key>
-    <key name="screensaver" type="s">
-      <default>'&lt;Control&gt;&lt;Alt&gt;l'</default>
-      <_summary>Lock screen</_summary>
-      <_description>Binding to lock the screen.</_description>
-    </key>
-    <key name="search" type="s">
-      <default>'XF86Search'</default>
-      <_summary>Search</_summary>
-      <_description>Binding to launch the search tool.</_description>
-    </key>
-    <key name="stop" type="s">
-      <default>'XF86AudioStop'</default>
-      <_summary>Stop playback</_summary>
-      <_description>Binding to stop playback.</_description>
-    </key>
-    <key name="volume-down" type="s">
-      <default>'XF86AudioLowerVolume'</default>
-      <_summary>Volume down</_summary>
-      <_description>Binding to lower the system volume.</_description>
-    </key>
-    <key name="volume-mute" type="s">
-      <default>'XF86AudioMute'</default>
-      <_summary>Volume mute</_summary>
-      <_description>Binding to mute the system volume.</_description>
-    </key>
-    <key name="volume-up" type="s">
-      <default>'XF86AudioRaiseVolume'</default>
-      <_summary>Volume up</_summary>
-      <_description>Binding to raise the system volume.</_description>
-    </key>
-    <key name="screenshot" type="s">
-      <default>'Print'</default>
-      <_summary>Take a screenshot</_summary>
-      <_description>Binding to take a screenshot.</_description>
-    </key>
-    <key name="window-screenshot" type="s">
-      <default>'&lt;Alt&gt;Print'</default>
-      <_summary>Take a screenshot of a window</_summary>
-      <_description>Binding to take a screenshot of a window.</_description>
-    </key>
-    <key name="area-screenshot" type="s">
-      <default>'&lt;Shift&gt;Print'</default>
-      <_summary>Take a screenshot of an area</_summary>
-      <_description>Binding to take a screenshot of an area.</_description>
-    </key>
-    <key name="screenshot-clip" type="s">
-      <default>'&lt;Ctrl&gt;Print'</default>
-      <_summary>Copy a screenshot to clipboard</_summary>
-      <_description>Binding to copy a screenshot to clipboard.</_description>
-    </key>
-    <key name="window-screenshot-clip" type="s">
-      <default>'&lt;Ctrl&gt;&lt;Alt&gt;Print'</default>
-      <_summary>Copy a screenshot of a window to clipboard</_summary>
-      <_description>Binding to copy a screenshot of a window to clipboard.</_description>
-    </key>
-    <key name="area-screenshot-clip" type="s">
-      <default>'&lt;Ctrl&gt;&lt;Shift&gt;Print'</default>
-      <_summary>Copy a screenshot of an area to clipboard</_summary>
-      <_description>Binding to copy a screenshot of an area to clipboard.</_description>
-    </key>
-    <key name="terminal" type="s">
-      <default>'&lt;Primary&gt;&lt;Alt&gt;t'</default>
-      <_summary>Launch terminal</_summary>
-      <_description>Binding to launch the terminal.</_description>
-    </key>
-    <key name="www" type="s">
-      <default>'XF86WWW'</default>
-      <_summary>Launch web browser</_summary>
-      <_description>Binding to launch the web browser.</_description>
-    </key>
-    <key name="magnifier" type="s">
-      <default>'&lt;Alt&gt;&lt;Super&gt;8'</default>
-      <_summary>Toggle magnifier</_summary>
-      <_description>Binding to show the screen magnifier</_description>
-    </key>
-    <key name="screenreader" type="s">
-      <default>''</default>
-      <_summary>Toggle screen reader</_summary>
-      <_description>Binding to start the screen reader</_description>
-    </key>
-    <key name="on-screen-keyboard" type="s">
-      <default>''</default>
-      <_summary>Toggle on-screen keyboard</_summary>
-      <_description>Binding to show the on-screen keyboard</_description>
-    </key>
-    <key name="increase-text-size" type="s">
-      <default>''</default>
-      <_summary>Increase text size</_summary>
-      <_description>Binding to increase the text size</_description>
-    </key>
-    <key name="decrease-text-size" type="s">
-      <default>''</default>
-      <_summary>Decrease text size</_summary>
-      <_description>Binding to decrease the text size</_description>
-    </key>
-    <key name="toggle-contrast" type="s">
-      <default>''</default>
-      <_summary>Toggle contrast</_summary>
-      <_description>Binding to toggle the interface contrast</_description>
-    </key>
-    <key name="magnifier-zoom-in" type="s">
-      <default>'&lt;Alt&gt;&lt;Super&gt;equal'</default>
-      <_summary>Magnifier zoom in</_summary>
-      <_description>Binding for the magnifier to zoom in</_description>
-    </key>
-    <key name="magnifier-zoom-out" type="s">
-      <default>'&lt;Alt&gt;&lt;Super&gt;minus'</default>
-      <_summary>Magnifier zoom out</_summary>
-      <_description>Binding for the magnifier to zoom out</_description>
-    </key>
-    <key name="switch-input-source" type="s">
-      <default>''</default>
-      <_summary>Switch input source</_summary>
-      <_description>Binding to select the next input source</_description>
-    </key>
-    <key name="switch-input-source-backward" type="s">
-      <default>''</default>
-      <_summary>Switch input source backward</_summary>
-      <_description>Binding to select the previous input source</_description>
-    </key>
-  </schema>
-
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">
-    <key name="name" type="s">
-      <default>''</default>
-      <_summary>Name</_summary>
-      <_description>Name of the custom binding</_description>
-    </key>
-    <key name="binding" type="s">
-      <default>''</default>
-      <_summary>Binding</_summary>
-      <_description>Binding for the custom binding</_description>
-    </key>
-    <key name="command" type="s">
-      <default>''</default>
-      <_summary>Command</_summary>
-      <_description>Command to run when the binding is invoked</_description>
-    </key>
-  </schema>
-</schemalist>

=== removed directory '.pc/sync_input_sources_to_accountsservice.patch'
=== removed file '.pc/sync_input_sources_to_accountsservice.patch/configure.ac'
--- .pc/sync_input_sources_to_accountsservice.patch/configure.ac	2013-08-29 16:10:41 +0000
+++ .pc/sync_input_sources_to_accountsservice.patch/configure.ac	1970-01-01 00:00:00 +0000
@@ -1,609 +0,0 @@
-AC_PREREQ([2.60])
-
-AC_INIT([gnome-settings-daemon],
-        [3.6.4],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
-
-AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
-
-AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz no-dist-gzip check-news])
-AM_MAINTAINER_MODE([enable])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-m4_define([gsd_api_version_major],[3])
-m4_define([gsd_api_version_minor],[0])
-m4_define([gsd_api_version],[gsd_api_version_major.gsd_api_version_minor])
-GSD_API_VERSION="gsd_api_version"
-AC_SUBST(GSD_API_VERSION)
-
-AC_STDC_HEADERS
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-
-AC_HEADER_STDC
-
-AC_SUBST(VERSION)
-
-AC_CONFIG_HEADERS([config.h])
-
-IT_PROG_INTLTOOL([0.37.1])
-
-GETTEXT_PACKAGE=gnome-settings-daemon
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain])
-
-AM_GLIB_GNU_GETTEXT
-
-GSD_INTLTOOL_PLUGIN_RULE='%.gnome-settings-plugin:   %.gnome-settings-plugin.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST([GSD_INTLTOOL_PLUGIN_RULE])
-
-dnl ---------------------------------------------------------------------------
-dnl - Dependencies
-dnl ---------------------------------------------------------------------------
-
-GLIB_REQUIRED_VERSION=2.31.0
-GTK_REQUIRED_VERSION=3.3.18
-GCONF_REQUIRED_VERSION=2.6.1
-GIO_REQUIRED_VERSION=2.26.0
-GNOME_DESKTOP_REQUIRED_VERSION=3.5.3
-LIBNOTIFY_REQUIRED_VERSION=0.7.3
-UPOWER_GLIB_REQUIRED_VERSION=0.9.1
-PA_REQUIRED_VERSION=0.9.16
-LIBWACOM_REQUIRED_VERSION=0.6
-UPOWER_REQUIRED_VERSION=0.9.11
-APPINDICATOR_REQUIRED_VERSION=0.3.0
-IBUS_REQUIRED_VERSION=1.4.99
-
-EXTRA_COMPILE_WARNINGS(yes)
-
-PKG_CHECK_MODULES(SETTINGS_DAEMON,
-        glib-2.0 >= $GLIB_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gmodule-2.0
-        gthread-2.0
-	gsettings-desktop-schemas >= 3.5.90
-)
-
-PKG_CHECK_MODULES(SETTINGS_PLUGIN,
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        libnotify >= $LIBNOTIFY_REQUIRED_VERSION
-        gsettings-desktop-schemas
-        x11
-)
-
-GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
-case $host_os in
-  darwin*)
-    GSD_PLUGIN_LDFLAGS="${GSD_PLUGIN_LDFLAGS} -Wl,-bundle_loader,\$(top_builddir)/gnome-settings-daemon/gnome-settings-daemon"
-    ;;
-esac
-AC_SUBST([GSD_PLUGIN_LDFLAGS])
-
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
-dnl ================================================================
-dnl GSettings stuff
-dnl ================================================================
-
-GLIB_GSETTINGS
-
-dnl ---------------------------------------------------------------------------
-dnl - Check for gnome-desktop
-dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-
-dnl ---------------------------------------------------------------------------
-dnl - Check for LCMS2
-dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no)
-if test x$have_new_lcms = xyes; then
-        AC_DEFINE(HAVE_NEW_LCMS,1,[Got new lcms2])
-else
-        PKG_CHECK_MODULES(LCMS, lcms2)
-fi
-
-dnl ---------------------------------------------------------------------------
-dnl - Check for libnotify
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
-		  [have_libnotify=yes], have_libnotify=no)
-if test "x$have_libnotify" = xno ; then
-	AC_MSG_ERROR([libnotify is required to build gnome-settings-daemon])
-fi
-AC_SUBST(LIBNOTIFY_CFLAGS)
-AC_SUBST(LIBNOTIFY_LIBS)
-
-dnl ---------------------------------------------------------------------------
-dnl - GUdev integration (default enabled)
-dnl ---------------------------------------------------------------------------
-GUDEV_PKG=""
-AC_ARG_ENABLE(gudev, AS_HELP_STRING([--disable-gudev],[Disable GUdev support (not optional on Linux platforms)]), enable_gudev=$enableval)
-if test x$enable_gudev != xno; then
-	PKG_CHECK_MODULES(GUDEV, gudev-1.0, have_gudev="yes", have_gudev="no")
-	if test "x$have_gudev" = "xyes"; then
-		AC_DEFINE(HAVE_GUDEV, 1, [define if GUdev is available])
-		GUDEV_PKG="gudev-1.0"
-	else
-		if test x$enable_gudev = xyes; then
-			AC_MSG_ERROR([GUdev enabled but not found])
-		fi
-	fi
-else
-	have_gudev=no
-fi
-AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
-
-dnl ---------------------------------------------------------------------------
-dnl - common
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(COMMON, x11 kbproto xi)
-
-dnl ---------------------------------------------------------------------------
-dnl - automount
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(AUTOMOUNT, x11 kbproto)
-
-dnl ---------------------------------
-dnl - Application indicator
-dnl ---------------------------------
-
-AC_ARG_ENABLE([appindicator],
-	AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators]),
-	[enable_appindicator=$enableval],
-	[enable_appindicator="auto"])
-
-
-if test x$enable_appindicator = xauto ; then
-	PKG_CHECK_EXISTS(appindicator3-0.1 >= $APPINDICATOR_REQUIRED_VERSION,
-		[enable_appindicator="yes"],
-		[enable_appindicator="no"])
-fi
-
-if test x$enable_appindicator = xyes ; then
-	PKG_CHECK_MODULES(APPINDICATOR,
-		[appindicator3-0.1 >= $APPINDICATOR_REQUIRED_VERSION],
-		[AC_DEFINE(HAVE_APPINDICATOR, 1, [Have AppIndicator])])
-fi
-
-AM_CONDITIONAL(HAVE_APPINDICATOR, test x$enable_appindicator = xyes)
-AC_SUBST(APPINDICATOR_CFLAGS)
-AC_SUBST(APPINDICATOR_LIBS)
-
-dnl ---------------------------------------------------------------------------
-dnl - background
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(BACKGROUND, x11 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-
-dnl ---------------------------------------------------------------------------
-dnl - mouse
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(MOUSE, x11 xi)
-
-dnl ---------------------------------------------------------------------------
-dnl - cursor
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(CURSOR, xfixes)
-
-dnl ---------------------------------------------------------------------------
-dnl - xsettings
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(XSETTINGS, fontconfig)
-
-dnl ---------------------------------------------------------------------------
-dnl - Keyboard plugin stuff
-dnl ---------------------------------------------------------------------------
-
-AC_ARG_ENABLE(ibus,
-        AS_HELP_STRING([--disable-ibus],
-                       [Disable IBus support]),
-        enable_ibus=$enableval,
-        enable_ibus=yes)
-
-if test "x$enable_ibus" = "xyes" ; then
-        IBUS_MODULE="ibus-1.0 >= $IBUS_REQUIRED_VERSION"
-        AC_DEFINE(HAVE_IBUS, 1, [Defined if IBus support is enabled])
-else
-        IBUS_MODULE=
-fi
-AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
-
-PKG_CHECK_MODULES(KEYBOARD, xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-
-dnl ---------------------------------------------------------------------------
-dnl - Housekeeping plugin stuff
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(GIOUNIX, [gio-unix-2.0])
-
-dnl ---------------------------------------------------------------------------
-dnl - media-keys plugin stuff
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra libnotify])
-
-dnl ---------------------------------------------------------------------------
-dnl - xrandr plugin stuff
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(XRANDR, [gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION upower-glib >= $UPOWER_REQUIRED_VERSION])
-
-dnl ---------------------------------------------------------------------------
-dnl - orientation plugin stuff
-dnl ---------------------------------------------------------------------------
-
-if test x$have_gudev != xno; then
-	PKG_CHECK_MODULES(ORIENTATION, [gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION gudev-1.0])
-fi
-
-dnl ---------------------------------------------------------------------------
-dnl - sound plugin stuff
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(SOUND, [libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION])
-
-# ---------------------------------------------------------------------------
-# Power
-# ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(POWER, upower-glib >= $UPOWER_REQUIRED_VERSION gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 libnotify x11 xext)
-
-if test x$have_gudev != xno; then
-	PKG_CHECK_MODULES(BACKLIGHT_HELPER,
-		glib-2.0 >= $GLIB_REQUIRED_VERSION
-		gudev-1.0
-	)
-fi
-
-dnl ---------------------------------------------------------------------------
-dnl - color
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-
-dnl ---------------------------------------------------------------------------
-dnl - wacom (disabled for s390/s390x and non Linux platforms)
-dnl ---------------------------------------------------------------------------
-
-case $host_os in
-  linux*)
-    if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-      have_wacom=no
-    else
-      if test x$enable_gudev != xno; then
-        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
-      else
-        AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-      fi
-      have_wacom=yes
-    fi
-    ;;
-  *)
-    have_wacom=no
-    ;;
-esac
-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
-
-dnl ==============================================
-dnl PackageKit section
-dnl ==============================================
-
-have_packagekit=false
-AC_ARG_ENABLE(packagekit,
-  AC_HELP_STRING([--disable-packagekit],
-                 [turn off PackageKit support]),
-       [case "${enableval}" in
-               yes) WANT_PACKAGEKIT=yes ;;
-               no)  WANT_PACKAGEKIT=no ;;
-               *) AC_MSG_ERROR(bad value ${enableval} for --disable-packagekit) ;;
-       esac],
-       [WANT_PACKAGEKIT=yes]) dnl Default value
-
-if test x$WANT_PACKAGEKIT = xyes ; then
-       PK_REQUIRED_VERSION=0.7.4
-       PKG_CHECK_MODULES(PACKAGEKIT, glib-2.0 packagekit-glib2 >= $PK_REQUIRED_VERSION upower-glib >= $UPOWER_REQUIRED_VERSION gudev-1.0 libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
-             [have_packagekit=true
-              AC_DEFINE(HAVE_PACKAGEKIT, 1, [Define if PackageKit should be used])],
-             [have_packagekit=false])
-fi
-AM_CONDITIONAL(HAVE_PACKAGEKIT, test "x$have_packagekit" = "xtrue")
-
-AC_SUBST(PACKAGEKIT_CFLAGS)
-AC_SUBST(PACKAGEKIT_LIBS)
-
-dnl ==============================================
-dnl smartcard section
-dnl ==============================================
-have_smartcard_support=false
-AC_ARG_ENABLE(smartcard-support,
-  AC_HELP_STRING([--disable-smartcard-support],
-                 [turn off smartcard support]),
-       [case "${enableval}" in
-               yes) WANT_SMARTCARD_SUPPORT=yes ;;
-               no)  WANT_SMARTCARD_SUPPORT=no ;;
-               *) AC_MSG_ERROR(bad value ${enableval} for --disable-smartcard-support) ;;
-       esac],
-       [WANT_SMARTCARD_SUPPORT=yes])
-
-if test x$WANT_SMARTCARD_SUPPORT = xyes ; then
-       NSS_REQUIRED_VERSION=3.11.2
-       PKG_CHECK_MODULES(NSS, nss >= $NSS_REQUIRED_VERSION,
-             [have_smartcard_support=true
-              AC_DEFINE(SMARTCARD_SUPPORT, 1, [Define if smartcard support should be enabled])],
-             [have_smartcard_support=false])
-fi
-AM_CONDITIONAL(SMARTCARD_SUPPORT, test "x$have_smartcard_support" = "xtrue")
-
-AC_SUBST(NSS_CFLAGS)
-AC_SUBST(NSS_LIBS)
-
-AC_ARG_WITH(nssdb,
-  AC_HELP_STRING([--with-nssdb],
-                 [where system NSS database is]))
-
-NSS_DATABASE=""
-if test "x$have_smartcard_support" = "xtrue"; then
-        if ! test -z "$with_nssdb" ; then
-                NSS_DATABASE="$with_nssdb"
-        else
-                NSS_DATABASE="${sysconfdir}/pki/nssdb"
-        fi
-else
-        if ! test -z "$with_nssdb" ; then
-                AC_MSG_WARN([nssdb specified when smartcard support is disabled])
-        fi
-fi
-
-AC_SUBST(NSS_DATABASE)
-
-
-dnl ==============================================
-dnl systemd check
-dnl ==============================================
-
-AC_ARG_ENABLE([systemd],
-              AS_HELP_STRING([--enable-systemd], [Use systemd for session tracking]),
-              [with_systemd=$enableval],
-              [with_systemd=no])
-if test "$with_systemd" = "yes" ; then
-  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-  AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-  SESSION_TRACKING=systemd
-else
-  SESSION_TRACKING=ConsoleKit
-fi
-
-AC_SUBST(SYSTEMD_CFLAGS)
-AC_SUBST(SYSTEMD_LIBS)
-
-AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
-
-# ---------------------------------------------------------------------------
-# CUPS
-# ---------------------------------------------------------------------------
-
-AC_ARG_ENABLE(cups,
-              AS_HELP_STRING([--disable-cups], [disable CUPS support (default: enabled)]),,
-              enable_cups=yes)
-
-if test x"$enable_cups" != x"no" ; then
-   AC_PROG_SED
-
-   AC_PATH_PROG(CUPS_CONFIG, cups-config)
-
-   if test x$CUPS_CONFIG = x; then
-     AC_MSG_ERROR([cups-config not found but CUPS support requested])
-   fi
-
-  CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
-  CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
-  CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
-
-  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],,
-                   AC_MSG_ERROR([CUPS headers not found but CUPS support requested]))
-
-   if ! test $CUPS_API_MAJOR -gt 1 -o \
-             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
-      AC_MSG_ERROR([CUPS 1.4 or newer not found, but CUPS support requested])
-   fi
-
-   CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
-   CUPS_LIBS=`$CUPS_CONFIG --libs`
-   AC_SUBST(CUPS_CFLAGS)
-   AC_SUBST(CUPS_LIBS)
-fi
-
-AM_CONDITIONAL(BUILD_PRINT_NOTIFICATIONS, [test x"$enable_cups" = x"yes"])
-
-# ---------------------------------------------------------------------------
-# Enable Profiling
-# ---------------------------------------------------------------------------
-AC_ARG_ENABLE(profiling,
-	[AC_HELP_STRING([--enable-profiling],
-	[turn on profiling])],
-	, enable_profiling=no)
-if test "x$enable_profiling" = "xyes"; then
-    AC_DEFINE(ENABLE_PROFILING,1,[enable profiling])
-fi
-
-
-# ---------------------------------------------------------------------------
-# Plugins
-# ---------------------------------------------------------------------------
-
-plugindir='$(libdir)/gnome-settings-daemon-gsd_api_version'
-AC_SUBST([plugindir])
-
-PLUGIN_CFLAGS="-DG_LOG_DOMAIN=\"\\\"\$(plugin_name)-plugin\\\"\" -DPLUGIN_NAME=\"\\\"\$(plugin_name)\\\"\" "
-AC_SUBST(PLUGIN_CFLAGS)
-
-AC_ARG_ENABLE(man,
-              [AS_HELP_STRING([--enable-man],
-                              [generate man pages [default=yes]])],,
-              enable_man=yes)
-if test "$enable_man" != no; then
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    AC_MSG_ERROR([xsltproc is required for --enable-man])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
-
-dnl ---------------------------------------------------------------------------
-dnl - Finish
-dnl ---------------------------------------------------------------------------
-
-
-# Turn on the additional warnings last, so warnings don't affect other tests.
-
-AC_ARG_ENABLE(more-warnings,
-	[AC_HELP_STRING([--enable-more-warnings],
-	[Maximum compiler warnings])],
-	set_more_warnings="$enableval",[
-		if test -d $srcdir/.git; then
-			set_more_warnings=yes
-		else
-			set_more_warnings=no
-		fi
-        ])
-AC_MSG_CHECKING(for more warnings)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-        AC_MSG_RESULT(yes)
-        CFLAGS="\
-        -Wall \
-        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-        -Wnested-externs -Wpointer-arith \
-        -Wcast-align -Wsign-compare \
-        $CFLAGS"
-
-        for option in -Wno-strict-aliasing -Wno-sign-compare; do
-                SAVE_CFLAGS="$CFLAGS"
-                CFLAGS="$CFLAGS $option"
-                AC_MSG_CHECKING([whether gcc understands $option])
-                AC_TRY_COMPILE([], [],
-                        has_option=yes,
-                        has_option=no,)
-                if test $has_option = no; then
-                        CFLAGS="$SAVE_CFLAGS"
-                fi
-                AC_MSG_RESULT($has_option)
-                unset has_option
-                unset SAVE_CFLAGS
-        done
-        unset option
-else
-        AC_MSG_RESULT(no)
-fi
-
-#
-# Enable Debug
-#
-AC_ARG_ENABLE(debug,
-	[AC_HELP_STRING([--enable-debug],
-	[turn on debugging])],
-	, enable_debug=yes)
-if test "$enable_debug" = "yes"; then
-	DEBUG_CFLAGS="-DG_ENABLE_DEBUG"
-else
-	if test "x$enable_debug" = "xno"; then
-		DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
-	else
-		DEBUG_CFLAGS=""
-	fi
-fi
-AC_SUBST(DEBUG_CFLAGS)
-
-AC_OUTPUT([
-Makefile
-gnome-settings-daemon/Makefile
-plugins/Makefile
-plugins/a11y-keyboard/Makefile
-plugins/a11y-settings/Makefile
-plugins/automount/Makefile
-plugins/background/Makefile
-plugins/clipboard/Makefile
-plugins/color/Makefile
-plugins/common/Makefile
-plugins/cursor/Makefile
-plugins/dummy/Makefile
-plugins/power/Makefile
-plugins/housekeeping/Makefile
-plugins/keyboard/Makefile
-plugins/media-keys/Makefile
-plugins/media-keys/cut-n-paste/Makefile
-plugins/mouse/Makefile
-plugins/orientation/Makefile
-plugins/print-notifications/Makefile
-plugins/screensaver-proxy/Makefile
-plugins/smartcard/Makefile
-plugins/sound/Makefile
-plugins/updates/Makefile
-plugins/wacom/Makefile
-plugins/xrandr/Makefile
-plugins/xsettings/Makefile
-data/Makefile
-data/gnome-settings-daemon.pc
-data/gnome-settings-daemon-uninstalled.pc
-data/org.gnome.settings-daemon.plugins.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.color.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
-data/org.gnome.settings-daemon.peripherals.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
-data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in
-po/Makefile.in
-man/Makefile
-])
-
-dnl ---------------------------------------------------------------------------
-dnl - Show summary
-dnl ---------------------------------------------------------------------------
-
-echo "
-                    gnome-settings-daemon $VERSION
-                    =============================
-
-        prefix:                   ${prefix}
-        exec_prefix:              ${exec_prefix}
-        libdir:                   ${libdir}
-        bindir:                   ${bindir}
-        sbindir:                  ${sbindir}
-        sysconfdir:               ${sysconfdir}
-        sysconfsubdir:            ${sysconfsubdir}
-        localstatedir:            ${localstatedir}
-        plugindir:                ${plugindir}
-        datadir:                  ${datadir}
-        source code location:     ${srcdir}
-        compiler:                 ${CC}
-        cflags:                   ${CFLAGS}
-        Maintainer mode:          ${USE_MAINTAINER_MODE}
-
-        Session tracking:         ${SESSION_TRACKING}
-        LCMS DICT support:        ${have_new_lcms}
-        IBus support:             ${enable_ibus}
-        Libnotify support:        ${have_libnotify}
-	App indicator support:    ${enable_appindicator}
-        PackageKit support:       ${have_packagekit}
-        Smartcard support:        ${have_smartcard_support}
-        Cups support:             ${enable_cups}
-        Wacom support:            ${have_wacom}
-${NSS_DATABASE:+\
-        System nssdb:             ${NSS_DATABASE}
-}\
-        Profiling support:        ${enable_profiling}
-"

=== removed directory '.pc/sync_input_sources_to_accountsservice.patch/plugins'
=== removed directory '.pc/sync_input_sources_to_accountsservice.patch/plugins/keyboard'
=== removed file '.pc/sync_input_sources_to_accountsservice.patch/plugins/keyboard/gsd-keyboard-manager.c'
--- .pc/sync_input_sources_to_accountsservice.patch/plugins/keyboard/gsd-keyboard-manager.c	2013-08-29 16:10:41 +0000
+++ .pc/sync_input_sources_to_accountsservice.patch/plugins/keyboard/gsd-keyboard-manager.c	1970-01-01 00:00:00 +0000
@@ -1,1708 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright © 2001 Ximian, Inc.
- * Copyright (C) 2007 William Jon McCann <[e-mail]>
- * Written by Sergey V. Oudaltsov <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include <locale.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-
-#include <X11/XKBlib.h>
-#include <X11/keysym.h>
-#include <X11/extensions/XKBrules.h>
-
-#define GNOME_DESKTOP_USE_UNSTABLE_API
-#include <libgnome-desktop/gnome-xkb-info.h>
-
-#ifdef HAVE_IBUS
-#include <ibus.h>
-#endif
-
-#include "gnome-settings-profile.h"
-#include "gsd-keyboard-manager.h"
-#include "gsd-input-helper.h"
-#include "gsd-enums.h"
-
-#define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
-
-#define GSD_KEYBOARD_DIR "org.gnome.settings-daemon.peripherals.keyboard"
-
-#define KEY_REPEAT         "repeat"
-#define KEY_CLICK          "click"
-#define KEY_INTERVAL       "repeat-interval"
-#define KEY_DELAY          "delay"
-#define KEY_CLICK_VOLUME   "click-volume"
-#define KEY_REMEMBER_NUMLOCK_STATE "remember-numlock-state"
-#define KEY_NUMLOCK_STATE  "numlock-state"
-
-#define KEY_BELL_VOLUME    "bell-volume"
-#define KEY_BELL_PITCH     "bell-pitch"
-#define KEY_BELL_DURATION  "bell-duration"
-#define KEY_BELL_MODE      "bell-mode"
-
-#define KEY_SWITCHER "input-sources-switcher"
-
-#define GNOME_DESKTOP_INTERFACE_DIR "org.gnome.desktop.interface"
-
-#define KEY_GTK_IM_MODULE    "gtk-im-module"
-#define GTK_IM_MODULE_SIMPLE "gtk-im-context-simple"
-#define GTK_IM_MODULE_IBUS   "ibus"
-
-#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
-
-#define KEY_CURRENT_INPUT_SOURCE "current"
-#define KEY_INPUT_SOURCES        "sources"
-#define KEY_KEYBOARD_OPTIONS     "xkb-options"
-
-#define INPUT_SOURCE_TYPE_XKB  "xkb"
-#define INPUT_SOURCE_TYPE_IBUS "ibus"
-
-#define DEFAULT_LANGUAGE "en_US"
-
-struct GsdKeyboardManagerPrivate
-{
-	guint      start_idle_id;
-        GSettings *settings;
-        GSettings *input_sources_settings;
-        GSettings *interface_settings;
-        GnomeXkbInfo *xkb_info;
-#ifdef HAVE_IBUS
-        IBusBus   *ibus;
-        GHashTable *ibus_engines;
-        GHashTable *ibus_xkb_engines;
-        GCancellable *ibus_cancellable;
-        gboolean session_is_fallback;
-#endif
-        gint       xkb_event_base;
-        GsdNumLockState old_state;
-        GdkDeviceManager *device_manager;
-        guint device_added_id;
-        guint device_removed_id;
-
-        gboolean input_sources_switcher_spawned;
-        GPid input_sources_switcher_pid;
-};
-
-static void     gsd_keyboard_manager_class_init  (GsdKeyboardManagerClass *klass);
-static void     gsd_keyboard_manager_init        (GsdKeyboardManager      *keyboard_manager);
-static void     gsd_keyboard_manager_finalize    (GObject                 *object);
-static gboolean apply_input_sources_settings     (GSettings               *settings,
-                                                  gpointer                 keys,
-                                                  gint                     n_keys,
-                                                  GsdKeyboardManager      *manager);
-static void     set_gtk_im_module                (GsdKeyboardManager      *manager,
-                                                  const gchar             *new_module);
-
-G_DEFINE_TYPE (GsdKeyboardManager, gsd_keyboard_manager, G_TYPE_OBJECT)
-
-static gpointer manager_object = NULL;
-
-static void
-init_builder_with_sources (GVariantBuilder *builder,
-                           GSettings       *settings)
-{
-        const gchar *type;
-        const gchar *id;
-        GVariantIter iter;
-        GVariant *sources;
-
-        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
-
-        g_variant_builder_init (builder, G_VARIANT_TYPE ("a(ss)"));
-
-        g_variant_iter_init (&iter, sources);
-        while (g_variant_iter_next (&iter, "(&s&s)", &type, &id))
-                g_variant_builder_add (builder, "(ss)", type, id);
-
-        g_variant_unref (sources);
-}
-
-static gboolean
-schema_is_installed (const gchar *name)
-{
-        const gchar * const *schemas;
-        const gchar * const *s;
-
-        schemas = g_settings_list_schemas ();
-        for (s = schemas; *s; ++s)
-                if (g_str_equal (*s, name))
-                        return TRUE;
-
-        return FALSE;
-}
-
-#ifdef HAVE_IBUS
-static void
-clear_ibus (GsdKeyboardManager *manager)
-{
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-
-        g_cancellable_cancel (priv->ibus_cancellable);
-        g_clear_object (&priv->ibus_cancellable);
-        g_clear_pointer (&priv->ibus_engines, g_hash_table_destroy);
-        g_clear_pointer (&priv->ibus_xkb_engines, g_hash_table_destroy);
-        g_clear_object (&priv->ibus);
-}
-
-static gchar *
-make_xkb_source_id (const gchar *engine_id)
-{
-        gchar *id;
-        gchar *p;
-        gint n_colons = 0;
-
-        /* engine_id is like "xkb:layout:variant:lang" where
-         * 'variant' and 'lang' might be empty */
-
-        engine_id += 4;
-
-        for (p = (gchar *)engine_id; *p; ++p)
-                if (*p == ':')
-                        if (++n_colons == 2)
-                                break;
-        if (!*p)
-                return NULL;
-
-        id = g_strndup (engine_id, p - engine_id + 1);
-
-        id[p - engine_id] = '\0';
-
-        /* id is "layout:variant" where 'variant' might be empty */
-
-        for (p = id; *p; ++p)
-                if (*p == ':') {
-                        if (*(p + 1) == '\0')
-                                *p = '\0';
-                        else
-                                *p = '+';
-                        break;
-                }
-
-        /* id is "layout+variant" or "layout" */
-
-        return id;
-}
-
-static void
-fetch_ibus_engines_result (GObject            *object,
-                           GAsyncResult       *result,
-                           GsdKeyboardManager *manager)
-{
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-        GList *list, *l;
-        GError *error = NULL;
-
-        /* engines shouldn't be there yet */
-        g_return_if_fail (priv->ibus_engines == NULL);
-
-        g_clear_object (&priv->ibus_cancellable);
-
-        list = ibus_bus_list_engines_async_finish (priv->ibus,
-                                                   result,
-                                                   &error);
-        if (!list && error) {
-                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-                        g_warning ("Couldn't finish IBus request: %s", error->message);
-                g_error_free (error);
-
-                clear_ibus (manager);
-                return;
-        }
-
-        /* Maps IBus engine ids to engine description objects */
-        priv->ibus_engines = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-        /* Maps XKB source id strings to engine description objects */
-        priv->ibus_xkb_engines = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-
-        for (l = list; l; l = l->next) {
-                IBusEngineDesc *engine = l->data;
-                const gchar *engine_id = ibus_engine_desc_get_name (engine);
-
-                g_hash_table_replace (priv->ibus_engines, (gpointer)engine_id, engine);
-
-                if (strncmp ("xkb:", engine_id, 4) == 0) {
-                        gchar *xkb_source_id = make_xkb_source_id (engine_id);
-                        if (xkb_source_id)
-                                g_hash_table_replace (priv->ibus_xkb_engines,
-                                                      xkb_source_id,
-                                                      engine);
-                }
-        }
-        g_list_free (list);
-
-        apply_input_sources_settings (priv->input_sources_settings, NULL, 0, manager);
-}
-
-static void
-fetch_ibus_engines (GsdKeyboardManager *manager)
-{
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-
-        /* engines shouldn't be there yet */
-        g_return_if_fail (priv->ibus_engines == NULL);
-        g_return_if_fail (priv->ibus_cancellable == NULL);
-
-        priv->ibus_cancellable = g_cancellable_new ();
-
-        ibus_bus_list_engines_async (priv->ibus,
-                                     -1,
-                                     priv->ibus_cancellable,
-                                     (GAsyncReadyCallback)fetch_ibus_engines_result,
-                                     manager);
-}
-
-static void
-maybe_start_ibus (GsdKeyboardManager *manager,
-                  GVariant           *sources)
-{
-        gboolean need_ibus = FALSE;
-        GVariantIter iter;
-        const gchar *type;
-
-        if (manager->priv->session_is_fallback)
-                return;
-
-        g_variant_iter_init (&iter, sources);
-        while (g_variant_iter_next (&iter, "(&s&s)", &type, NULL))
-                if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
-                        need_ibus = TRUE;
-                        break;
-                }
-
-        if (!need_ibus)
-                return;
-
-        if (!manager->priv->ibus) {
-                ibus_init ();
-                manager->priv->ibus = ibus_bus_new_async ();
-                g_signal_connect_swapped (manager->priv->ibus, "connected",
-                                          G_CALLBACK (fetch_ibus_engines), manager);
-                g_signal_connect_swapped (manager->priv->ibus, "disconnected",
-                                          G_CALLBACK (clear_ibus), manager);
-        }
-        /* IBus doesn't export API in the session bus. The only thing
-         * we have there is a well known name which we can use as a
-         * sure-fire way to activate it. */
-        g_bus_unwatch_name (g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                              IBUS_SERVICE_IBUS,
-                                              G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
-                                              NULL,
-                                              NULL,
-                                              NULL,
-                                              NULL));
-}
-
-static void
-got_session_name (GObject            *object,
-                  GAsyncResult       *res,
-                  GsdKeyboardManager *manager)
-{
-        GVariant *result, *variant;
-        GDBusConnection *connection = G_DBUS_CONNECTION (object);
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-        const gchar *session_name = NULL;
-        GError *error = NULL;
-
-        /* IBus shouldn't have been touched yet */
-        g_return_if_fail (priv->ibus == NULL);
-
-        g_clear_object (&priv->ibus_cancellable);
-
-        result = g_dbus_connection_call_finish (connection, res, &error);
-        if (!result) {
-                g_warning ("Couldn't get session name: %s", error->message);
-                g_error_free (error);
-                goto out;
-        }
-
-        g_variant_get (result, "(v)", &variant);
-        g_variant_unref (result);
-
-        g_variant_get (variant, "&s", &session_name);
-
-        if (g_strcmp0 (session_name, "gnome") == 0 || g_strcmp0 (session_name, "ubuntu") == 0)
-                manager->priv->session_is_fallback = FALSE;
-
-        g_variant_unref (variant);
- out:
-        apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
-        g_object_unref (connection);
-}
-
-static void
-got_bus (GObject            *object,
-         GAsyncResult       *res,
-         GsdKeyboardManager *manager)
-{
-        GDBusConnection *connection;
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-        GError *error = NULL;
-
-        /* IBus shouldn't have been touched yet */
-        g_return_if_fail (priv->ibus == NULL);
-
-        g_clear_object (&priv->ibus_cancellable);
-
-        connection = g_bus_get_finish (res, &error);
-        if (!connection) {
-                g_warning ("Couldn't get session bus: %s", error->message);
-                g_error_free (error);
-                apply_input_sources_settings (priv->input_sources_settings, NULL, 0, manager);
-                return;
-        }
-
-        priv->ibus_cancellable = g_cancellable_new ();
-
-        g_dbus_connection_call (connection,
-                                "org.gnome.SessionManager",
-                                "/org/gnome/SessionManager",
-                                "org.freedesktop.DBus.Properties",
-                                "Get",
-                                g_variant_new ("(ss)",
-                                               "org.gnome.SessionManager",
-                                               "SessionName"),
-                                NULL,
-                                G_DBUS_CALL_FLAGS_NONE,
-                                -1,
-                                priv->ibus_cancellable,
-                                (GAsyncReadyCallback)got_session_name,
-                                manager);
-}
-
-static void
-set_ibus_engine_finish (GObject            *object,
-                        GAsyncResult       *res,
-                        GsdKeyboardManager *manager)
-{
-        gboolean result;
-        IBusBus *ibus = IBUS_BUS (object);
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-        GError *error = NULL;
-
-        g_clear_object (&priv->ibus_cancellable);
-
-        result = ibus_bus_set_global_engine_async_finish (ibus, res, &error);
-        if (!result) {
-                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-                        g_warning ("Couldn't set IBus engine: %s", error->message);
-                g_error_free (error);
-        }
-}
-
-static void
-set_ibus_engine (GsdKeyboardManager *manager,
-                 const gchar        *engine_id)
-{
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-
-        g_return_if_fail (priv->ibus != NULL);
-        g_return_if_fail (priv->ibus_engines != NULL);
-
-        g_cancellable_cancel (priv->ibus_cancellable);
-        g_clear_object (&priv->ibus_cancellable);
-        priv->ibus_cancellable = g_cancellable_new ();
-
-        ibus_bus_set_global_engine_async (priv->ibus,
-                                          engine_id,
-                                          -1,
-                                          priv->ibus_cancellable,
-                                          (GAsyncReadyCallback)set_ibus_engine_finish,
-                                          manager);
-}
-
-static void
-set_ibus_xkb_engine (GsdKeyboardManager *manager,
-                     const gchar        *xkb_id)
-{
-        IBusEngineDesc *engine;
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-
-        if (!priv->ibus_xkb_engines)
-                return;
-
-        engine = g_hash_table_lookup (priv->ibus_xkb_engines, xkb_id);
-        if (!engine)
-                return;
-
-        set_ibus_engine (manager, ibus_engine_desc_get_name (engine));
-}
-
-/* XXX: See upstream bug:
- * https://codereview.appspot.com/6586075/ */
-static gchar *
-layout_from_ibus_layout (const gchar *ibus_layout)
-{
-        const gchar *p;
-
-        /* we get something like "layout(variant)[option1,option2]" */
-
-        p = ibus_layout;
-        while (*p) {
-                if (*p == '(' || *p == '[')
-                        break;
-                p += 1;
-        }
-
-        return g_strndup (ibus_layout, p - ibus_layout);
-}
-
-static gchar *
-variant_from_ibus_layout (const gchar *ibus_layout)
-{
-        const gchar *a, *b;
-
-        /* we get something like "layout(variant)[option1,option2]" */
-
-        a = ibus_layout;
-        while (*a) {
-                if (*a == '(')
-                        break;
-                a += 1;
-        }
-        if (!*a)
-                return NULL;
-
-        a += 1;
-        b = a;
-        while (*b) {
-                if (*b == ')')
-                        break;
-                b += 1;
-        }
-        if (!*b)
-                return NULL;
-
-        return g_strndup (a, b - a);
-}
-
-static gchar **
-options_from_ibus_layout (const gchar *ibus_layout)
-{
-        const gchar *a, *b;
-        GPtrArray *opt_array;
-
-        /* we get something like "layout(variant)[option1,option2]" */
-
-        a = ibus_layout;
-        while (*a) {
-                if (*a == '[')
-                        break;
-                a += 1;
-        }
-        if (!*a)
-                return NULL;
-
-        opt_array = g_ptr_array_new ();
-
-        do {
-                a += 1;
-                b = a;
-                while (*b) {
-                        if (*b == ',' || *b == ']')
-                                break;
-                        b += 1;
-                }
-                if (!*b)
-                        goto out;
-
-                g_ptr_array_add (opt_array, g_strndup (a, b - a));
-
-                a = b;
-        } while (*a && *a == ',');
-
-out:
-        g_ptr_array_add (opt_array, NULL);
-        return (gchar **) g_ptr_array_free (opt_array, FALSE);
-}
-
-static const gchar *
-engine_from_locale (void)
-{
-        const gchar *locale;
-        const gchar *locale_engine[][2] = {
-                { "as_IN", "m17n:as:phonetic" },
-                { "bn_IN", "m17n:bn:inscript" },
-                { "gu_IN", "m17n:gu:inscript" },
-                { "hi_IN", "m17n:hi:inscript" },
-                { "ja_JP", "anthy" },
-                { "kn_IN", "m17n:kn:kgp" },
-                { "ko_KR", "hangul" },
-                { "mai_IN", "m17n:mai:inscript" },
-                { "ml_IN", "m17n:ml:inscript" },
-                { "mr_IN", "m17n:mr:inscript" },
-                { "or_IN", "m17n:or:inscript" },
-                { "pa_IN", "m17n:pa:inscript" },
-                { "sd_IN", "m17n:sd:inscript" },
-                { "ta_IN", "m17n:ta:tamil99" },
-                { "te_IN", "m17n:te:inscript" },
-                { "zh_CN", "pinyin" },
-                { "zh_HK", "cangjie3" },
-                { "zh_TW", "chewing" },
-        };
-        gint i;
-
-        locale = setlocale (LC_CTYPE, NULL);
-        if (!locale)
-                return NULL;
-
-        for (i = 0; i < G_N_ELEMENTS (locale_engine); ++i)
-                if (g_str_has_prefix (locale, locale_engine[i][0]))
-                        return locale_engine[i][1];
-
-        return NULL;
-}
-
-static void
-add_ibus_sources_from_locale (GSettings *settings)
-{
-        const gchar *locale_engine;
-        GVariantBuilder builder;
-
-        locale_engine = engine_from_locale ();
-        if (!locale_engine)
-                return;
-
-        init_builder_with_sources (&builder, settings);
-        g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, locale_engine);
-        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-}
-
-static void
-convert_ibus (GSettings *settings)
-{
-        GVariantBuilder builder;
-        GSettings *ibus_settings;
-        gchar **engines, **e;
-
-        if (!schema_is_installed ("org.freedesktop.ibus.general"))
-                return;
-
-        init_builder_with_sources (&builder, settings);
-
-        ibus_settings = g_settings_new ("org.freedesktop.ibus.general");
-        engines = g_settings_get_strv (ibus_settings, "preload-engines");
-        for (e = engines; *e; ++e) {
-                if (g_str_has_prefix (*e, "xkb:"))
-                        continue;
-                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, *e);
-        }
-
-        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-
-        g_strfreev (engines);
-        g_object_unref (ibus_settings);
-}
-#endif  /* HAVE_IBUS */
-
-static gboolean
-xkb_set_keyboard_autorepeat_rate (guint delay, guint interval)
-{
-        return XkbSetAutoRepeatRate (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                                     XkbUseCoreKbd,
-                                     delay,
-                                     interval);
-}
-
-static gboolean
-check_xkb_extension (GsdKeyboardManager *manager)
-{
-        Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-        int opcode, error_base, major, minor;
-        gboolean have_xkb;
-
-        have_xkb = XkbQueryExtension (dpy,
-                                      &opcode,
-                                      &manager->priv->xkb_event_base,
-                                      &error_base,
-                                      &major,
-                                      &minor);
-        return have_xkb;
-}
-
-static void
-xkb_init (GsdKeyboardManager *manager)
-{
-        Display *dpy;
-
-        dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-        XkbSelectEventDetails (dpy,
-                               XkbUseCoreKbd,
-                               XkbStateNotify,
-                               XkbModifierLockMask,
-                               XkbModifierLockMask);
-}
-
-static unsigned
-numlock_NumLock_modifier_mask (void)
-{
-        Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-        return XkbKeysymToModifiers (dpy, XK_Num_Lock);
-}
-
-static void
-numlock_set_xkb_state (GsdNumLockState new_state)
-{
-        unsigned int num_mask;
-        Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-        if (new_state != GSD_NUM_LOCK_STATE_ON && new_state != GSD_NUM_LOCK_STATE_OFF)
-                return;
-        num_mask = numlock_NumLock_modifier_mask ();
-        XkbLockModifiers (dpy, XkbUseCoreKbd, num_mask, new_state == GSD_NUM_LOCK_STATE_ON ? num_mask : 0);
-}
-
-static const char *
-num_lock_state_to_string (GsdNumLockState numlock_state)
-{
-	switch (numlock_state) {
-	case GSD_NUM_LOCK_STATE_UNKNOWN:
-		return "GSD_NUM_LOCK_STATE_UNKNOWN";
-	case GSD_NUM_LOCK_STATE_ON:
-		return "GSD_NUM_LOCK_STATE_ON";
-	case GSD_NUM_LOCK_STATE_OFF:
-		return "GSD_NUM_LOCK_STATE_OFF";
-	default:
-		return "UNKNOWN";
-	}
-}
-
-static GdkFilterReturn
-xkb_events_filter (GdkXEvent *xev_,
-		   GdkEvent  *gdkev_,
-		   gpointer   user_data)
-{
-        XEvent *xev = (XEvent *) xev_;
-	XkbEvent *xkbev = (XkbEvent *) xev;
-        GsdKeyboardManager *manager = (GsdKeyboardManager *) user_data;
-
-        if (xev->type != manager->priv->xkb_event_base ||
-            xkbev->any.xkb_type != XkbStateNotify)
-		return GDK_FILTER_CONTINUE;
-
-	if (xkbev->state.changed & XkbModifierLockMask) {
-		unsigned num_mask = numlock_NumLock_modifier_mask ();
-		unsigned locked_mods = xkbev->state.locked_mods;
-		GsdNumLockState numlock_state;
-
-		numlock_state = (num_mask & locked_mods) ? GSD_NUM_LOCK_STATE_ON : GSD_NUM_LOCK_STATE_OFF;
-
-		if (numlock_state != manager->priv->old_state) {
-			g_debug ("New num-lock state '%s' != Old num-lock state '%s'",
-				 num_lock_state_to_string (numlock_state),
-				 num_lock_state_to_string (manager->priv->old_state));
-			g_settings_set_enum (manager->priv->settings,
-					     KEY_NUMLOCK_STATE,
-					     numlock_state);
-			manager->priv->old_state = numlock_state;
-		}
-	}
-
-        return GDK_FILTER_CONTINUE;
-}
-
-static void
-install_xkb_filter (GsdKeyboardManager *manager)
-{
-        gdk_window_add_filter (NULL,
-                               xkb_events_filter,
-                               manager);
-}
-
-static void
-remove_xkb_filter (GsdKeyboardManager *manager)
-{
-        gdk_window_remove_filter (NULL,
-                                  xkb_events_filter,
-                                  manager);
-}
-
-static void
-free_xkb_component_names (XkbComponentNamesRec *p)
-{
-        g_return_if_fail (p != NULL);
-
-        free (p->keymap);
-        free (p->keycodes);
-        free (p->types);
-        free (p->compat);
-        free (p->symbols);
-        free (p->geometry);
-
-        g_free (p);
-}
-
-static void
-upload_xkb_description (const gchar          *rules_file_path,
-                        XkbRF_VarDefsRec     *var_defs,
-                        XkbComponentNamesRec *comp_names)
-{
-        Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-        XkbDescRec *xkb_desc;
-        gchar *rules_file;
-
-        /* Upload it to the X server using the same method as setxkbmap */
-        xkb_desc = XkbGetKeyboardByName (display,
-                                         XkbUseCoreKbd,
-                                         comp_names,
-                                         XkbGBN_AllComponentsMask,
-                                         XkbGBN_AllComponentsMask &
-                                         (~XkbGBN_GeometryMask), True);
-        if (!xkb_desc) {
-                g_warning ("Couldn't upload new XKB keyboard description");
-                return;
-        }
-
-        XkbFreeKeyboard (xkb_desc, 0, True);
-
-        rules_file = g_path_get_basename (rules_file_path);
-
-        if (!XkbRF_SetNamesProp (display, rules_file, var_defs))
-                g_warning ("Couldn't update the XKB root window property");
-
-        g_free (rules_file);
-}
-
-static gchar *
-language_code_from_locale (const gchar *locale)
-{
-        if (!locale || !locale[0] || !locale[1])
-                return NULL;
-
-        if (!locale[2] || locale[2] == '_' || locale[2] == '.')
-                return g_strndup (locale, 2);
-
-        if (!locale[3] || locale[3] == '_' || locale[3] == '.')
-                return g_strndup (locale, 3);
-
-        return NULL;
-}
-
-static gchar *
-build_xkb_group_string (const gchar *user,
-                        const gchar *locale,
-                        const gchar *latin)
-{
-        gchar *string;
-        gsize length = 0;
-        guint commas = 2;
-
-        if (latin)
-                length += strlen (latin);
-        else
-                commas -= 1;
-
-        if (locale)
-                length += strlen (locale);
-        else
-                commas -= 1;
-
-        length += strlen (user) + commas + 1;
-
-        string = malloc (length);
-
-        if (locale && latin)
-                sprintf (string, "%s,%s,%s", user, locale, latin);
-        else if (locale)
-                sprintf (string, "%s,%s", user, locale);
-        else if (latin)
-                sprintf (string, "%s,%s", user, latin);
-        else
-                sprintf (string, "%s", user);
-
-        return string;
-}
-
-static gboolean
-layout_equal (const gchar *layout_a,
-              const gchar *variant_a,
-              const gchar *layout_b,
-              const gchar *variant_b)
-{
-        return !g_strcmp0 (layout_a, layout_b) && !g_strcmp0 (variant_a, variant_b);
-}
-
-static void
-replace_layout_and_variant (GsdKeyboardManager *manager,
-                            XkbRF_VarDefsRec   *xkb_var_defs,
-                            const gchar        *layout,
-                            const gchar        *variant)
-{
-        /* Toolkits need to know about both a latin layout to handle
-         * accelerators which are usually defined like Ctrl+C and a
-         * layout with the symbols for the language used in UI strings
-         * to handle mnemonics like Alt+Ф, so we try to find and add
-         * them in XKB group slots after the layout which the user
-         * actually intends to type with. */
-        const gchar *latin_layout = "us";
-        const gchar *latin_variant = "";
-        const gchar *locale_layout = NULL;
-        const gchar *locale_variant = NULL;
-        const gchar *locale;
-        gchar *language;
-
-        if (!layout)
-                return;
-
-        if (!variant)
-                variant = "";
-
-        locale = setlocale (LC_MESSAGES, NULL);
-        /* If LANG is empty, default to en_US */
-        if (!locale)
-                language = g_strdup (DEFAULT_LANGUAGE);
-        else
-                language = language_code_from_locale (locale);
-
-        if (!language)
-                language = language_code_from_locale (DEFAULT_LANGUAGE);
-
-        gnome_xkb_info_get_layout_info_for_language (manager->priv->xkb_info,
-                                                     language,
-                                                     NULL,
-                                                     NULL,
-                                                     NULL,
-                                                     &locale_layout,
-                                                     &locale_variant);
-        g_free (language);
-
-        /* We want to minimize the number of XKB groups if we have
-         * duplicated layout+variant pairs.
-         *
-         * Also, if a layout doesn't have a variant we still have to
-         * include it in the variants string because the number of
-         * variants must agree with the number of layouts. For
-         * instance:
-         *
-         * layouts:  "us,ru,us"
-         * variants: "dvorak,,"
-         */
-        if (layout_equal (latin_layout, latin_variant, locale_layout, locale_variant) ||
-            layout_equal (latin_layout, latin_variant, layout, variant)) {
-                latin_layout = NULL;
-                latin_variant = NULL;
-        }
-
-        if (layout_equal (locale_layout, locale_variant, layout, variant)) {
-                locale_layout = NULL;
-                locale_variant = NULL;
-        }
-
-        free (xkb_var_defs->layout);
-        xkb_var_defs->layout = build_xkb_group_string (layout, locale_layout, latin_layout);
-
-        free (xkb_var_defs->variant);
-        xkb_var_defs->variant = build_xkb_group_string (variant, locale_variant, latin_variant);
-}
-
-static gchar *
-build_xkb_options_string (gchar **options)
-{
-        gchar *string;
-
-        if (*options) {
-                gint i;
-                gsize len;
-                gchar *ptr;
-
-                /* First part, getting length */
-                len = 1 + strlen (options[0]);
-                for (i = 1; options[i] != NULL; i++)
-                        len += strlen (options[i]);
-                len += (i - 1); /* commas */
-
-                /* Second part, building string */
-                string = malloc (len);
-                ptr = g_stpcpy (string, *options);
-                for (i = 1; options[i] != NULL; i++) {
-                        ptr = g_stpcpy (ptr, ",");
-                        ptr = g_stpcpy (ptr, options[i]);
-                }
-        } else {
-                string = malloc (1);
-                *string = '\0';
-        }
-
-        return string;
-}
-
-static gchar **
-append_options (gchar **a,
-                gchar **b)
-{
-        gchar **c, **p;
-
-        if (!a && !b)
-                return NULL;
-        else if (!a)
-                return g_strdupv (b);
-        else if (!b)
-                return g_strdupv (a);
-
-        c = g_new0 (gchar *, g_strv_length (a) + g_strv_length (b) + 1);
-        p = c;
-
-        while (*a) {
-                *p = g_strdup (*a);
-                p += 1;
-                a += 1;
-        }
-        while (*b) {
-                *p = g_strdup (*b);
-                p += 1;
-                b += 1;
-        }
-
-        return c;
-}
-
-static void
-add_xkb_options (GsdKeyboardManager *manager,
-                 XkbRF_VarDefsRec   *xkb_var_defs,
-                 gchar             **extra_options)
-{
-        gchar **options;
-        gchar **settings_options;
-
-        settings_options = g_settings_get_strv (manager->priv->input_sources_settings,
-                                                KEY_KEYBOARD_OPTIONS);
-        options = append_options (settings_options, extra_options);
-        g_strfreev (settings_options);
-
-        free (xkb_var_defs->options);
-        xkb_var_defs->options = build_xkb_options_string (options);
-
-        g_strfreev (options);
-}
-
-static void
-apply_xkb_settings (GsdKeyboardManager *manager,
-                    const gchar        *layout,
-                    const gchar        *variant,
-                    gchar             **options)
-{
-        XkbRF_RulesRec *xkb_rules;
-        XkbRF_VarDefsRec *xkb_var_defs;
-        gchar *rules_file_path;
-
-        gnome_xkb_info_get_var_defs (&rules_file_path, &xkb_var_defs);
-
-        add_xkb_options (manager, xkb_var_defs, options);
-        replace_layout_and_variant (manager, xkb_var_defs, layout, variant);
-
-        gdk_error_trap_push ();
-
-        xkb_rules = XkbRF_Load (rules_file_path, NULL, True, True);
-        if (xkb_rules) {
-                XkbComponentNamesRec *xkb_comp_names;
-                xkb_comp_names = g_new0 (XkbComponentNamesRec, 1);
-
-                XkbRF_GetComponents (xkb_rules, xkb_var_defs, xkb_comp_names);
-                upload_xkb_description (rules_file_path, xkb_var_defs, xkb_comp_names);
-
-                free_xkb_component_names (xkb_comp_names);
-                XkbRF_Free (xkb_rules, True);
-        } else {
-                g_warning ("Couldn't load XKB rules");
-        }
-
-        if (gdk_error_trap_pop ())
-                g_warning ("Error loading XKB rules");
-
-        gnome_xkb_info_free_var_defs (xkb_var_defs);
-        g_free (rules_file_path);
-}
-
-static void
-set_gtk_im_module (GsdKeyboardManager *manager,
-                   const gchar        *new_module)
-{
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-        gchar *current_module;
-
-        current_module = g_settings_get_string (priv->interface_settings,
-                                                KEY_GTK_IM_MODULE);
-        if (!g_str_equal (current_module, new_module))
-                g_settings_set_string (priv->interface_settings,
-                                       KEY_GTK_IM_MODULE,
-                                       new_module);
-        g_free (current_module);
-}
-
-static gboolean
-apply_input_sources_settings (GSettings          *settings,
-                              gpointer            keys,
-                              gint                n_keys,
-                              GsdKeyboardManager *manager)
-{
-        GsdKeyboardManagerPrivate *priv = manager->priv;
-        GVariant *sources;
-        guint current;
-        guint n_sources;
-        const gchar *type = NULL;
-        const gchar *id = NULL;
-        gchar *layout = NULL;
-        gchar *variant = NULL;
-        gchar **options = NULL;
-
-        sources = g_settings_get_value (priv->input_sources_settings, KEY_INPUT_SOURCES);
-        current = g_settings_get_uint (priv->input_sources_settings, KEY_CURRENT_INPUT_SOURCE);
-        n_sources = g_variant_n_children (sources);
-
-        if (n_sources < 1)
-                goto exit;
-
-        if (current >= n_sources) {
-                g_settings_set_uint (priv->input_sources_settings,
-                                     KEY_CURRENT_INPUT_SOURCE,
-                                     n_sources - 1);
-                goto exit;
-        }
-
-#ifdef HAVE_IBUS
-        maybe_start_ibus (manager, sources);
-#endif
-
-        g_variant_get_child (sources, current, "(&s&s)", &type, &id);
-
-        if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB)) {
-                const gchar *l, *v;
-                gnome_xkb_info_get_layout_info (priv->xkb_info, id, NULL, NULL, &l, &v);
-
-                layout = g_strdup (l);
-                variant = g_strdup (v);
-
-                if (!layout || !layout[0]) {
-                        g_warning ("Couldn't find XKB input source '%s'", id);
-                        goto exit;
-                }
-                set_gtk_im_module (manager, GTK_IM_MODULE_SIMPLE);
-#ifdef HAVE_IBUS
-                set_ibus_xkb_engine (manager, id);
-#endif
-        } else if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
-#ifdef HAVE_IBUS
-                IBusEngineDesc *engine_desc = NULL;
-
-                if (priv->session_is_fallback)
-                        goto exit;
-
-                if (priv->ibus_engines)
-                        engine_desc = g_hash_table_lookup (priv->ibus_engines, id);
-                else
-                        goto exit; /* we'll be called again when ibus is up and running */
-
-                if (engine_desc) {
-                        const gchar *ibus_layout;
-                        ibus_layout = ibus_engine_desc_get_layout (engine_desc);
-
-                        if (ibus_layout) {
-                                layout = layout_from_ibus_layout (ibus_layout);
-                                variant = variant_from_ibus_layout (ibus_layout);
-                                options = options_from_ibus_layout (ibus_layout);
-                        }
-                } else {
-                        g_warning ("Couldn't find IBus input source '%s'", id);
-                        goto exit;
-                }
-
-                set_gtk_im_module (manager, GTK_IM_MODULE_IBUS);
-                set_ibus_engine (manager, id);
-#else
-                g_warning ("IBus input source type specified but IBus support was not compiled");
-#endif
-        } else {
-                g_warning ("Unknown input source type '%s'", type);
-        }
-
- exit:
-        apply_xkb_settings (manager, layout, variant, options);
-        g_variant_unref (sources);
-        g_free (layout);
-        g_free (variant);
-        g_strfreev (options);
-        /* Prevent individual "changed" signal invocations since we
-           don't need them. */
-        return TRUE;
-}
-
-static void
-apply_bell (GsdKeyboardManager *manager)
-{
-	GSettings       *settings;
-        XKeyboardControl kbdcontrol;
-        gboolean         click;
-        int              bell_volume;
-        int              bell_pitch;
-        int              bell_duration;
-        GsdBellMode      bell_mode;
-        int              click_volume;
-
-        g_debug ("Applying the bell settings");
-        settings      = manager->priv->settings;
-        click         = g_settings_get_boolean  (settings, KEY_CLICK);
-        click_volume  = g_settings_get_int   (settings, KEY_CLICK_VOLUME);
-
-        bell_pitch    = g_settings_get_int   (settings, KEY_BELL_PITCH);
-        bell_duration = g_settings_get_int   (settings, KEY_BELL_DURATION);
-
-        bell_mode = g_settings_get_enum (settings, KEY_BELL_MODE);
-        bell_volume   = (bell_mode == GSD_BELL_MODE_ON) ? 50 : 0;
-
-        /* as percentage from 0..100 inclusive */
-        if (click_volume < 0) {
-                click_volume = 0;
-        } else if (click_volume > 100) {
-                click_volume = 100;
-        }
-        kbdcontrol.key_click_percent = click ? click_volume : 0;
-        kbdcontrol.bell_percent = bell_volume;
-        kbdcontrol.bell_pitch = bell_pitch;
-        kbdcontrol.bell_duration = bell_duration;
-
-        gdk_error_trap_push ();
-        XChangeKeyboardControl (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                                KBKeyClickPercent | KBBellPercent | KBBellPitch | KBBellDuration,
-                                &kbdcontrol);
-
-        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-        gdk_error_trap_pop_ignored ();
-}
-
-static void
-apply_numlock (GsdKeyboardManager *manager)
-{
-	GSettings *settings;
-        gboolean rnumlock;
-
-        g_debug ("Applying the num-lock settings");
-        settings = manager->priv->settings;
-        rnumlock = g_settings_get_boolean  (settings, KEY_REMEMBER_NUMLOCK_STATE);
-        manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
-
-        gdk_error_trap_push ();
-        if (rnumlock) {
-                g_debug ("Remember num-lock is set, so applying setting '%s'",
-                         num_lock_state_to_string (manager->priv->old_state));
-                numlock_set_xkb_state (manager->priv->old_state);
-        }
-
-        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-        gdk_error_trap_pop_ignored ();
-}
-
-static void
-apply_repeat (GsdKeyboardManager *manager)
-{
-	GSettings       *settings;
-        gboolean         repeat;
-        guint            interval;
-        guint            delay;
-
-        g_debug ("Applying the repeat settings");
-        settings      = manager->priv->settings;
-        repeat        = g_settings_get_boolean  (settings, KEY_REPEAT);
-        interval      = g_settings_get_uint  (settings, KEY_INTERVAL);
-        delay         = g_settings_get_uint  (settings, KEY_DELAY);
-
-        gdk_error_trap_push ();
-        if (repeat) {
-                gboolean rate_set = FALSE;
-
-                XAutoRepeatOn (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-                /* Use XKB in preference */
-                rate_set = xkb_set_keyboard_autorepeat_rate (delay, interval);
-
-                if (!rate_set)
-                        g_warning ("Neither XKeyboard not Xfree86's keyboard extensions are available,\n"
-                                   "no way to support keyboard autorepeat rate settings");
-        } else {
-                XAutoRepeatOff (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-        }
-
-        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-        gdk_error_trap_pop_ignored ();
-}
-
-static void
-apply_all_settings (GsdKeyboardManager *manager)
-{
-	apply_repeat (manager);
-	apply_bell (manager);
-	apply_numlock (manager);
-}
-
-static void
-set_input_sources_switcher (GsdKeyboardManager *manager,
-                            gboolean            state)
-{
-        if (state) {
-                GError *error = NULL;
-                char *args[2];
-
-                if (manager->priv->input_sources_switcher_spawned)
-                        set_input_sources_switcher (manager, FALSE);
-
-                args[0] = LIBEXECDIR "/gsd-input-sources-switcher";
-                args[1] = NULL;
-
-                g_spawn_async (NULL, args, NULL,
-                               0, NULL, NULL,
-                               &manager->priv->input_sources_switcher_pid, &error);
-
-                manager->priv->input_sources_switcher_spawned = (error == NULL);
-
-                if (error) {
-                        g_warning ("Couldn't spawn %s: %s", args[0], error->message);
-                        g_error_free (error);
-                }
-        } else if (manager->priv->input_sources_switcher_spawned) {
-                kill (manager->priv->input_sources_switcher_pid, SIGHUP);
-                g_spawn_close_pid (manager->priv->input_sources_switcher_pid);
-                manager->priv->input_sources_switcher_spawned = FALSE;
-        }
-}
-
-static gboolean
-enable_switcher (GsdKeyboardManager *manager)
-{
-        GsdInputSourcesSwitcher switcher;
-
-        switcher = g_settings_get_enum (manager->priv->settings, KEY_SWITCHER);
-
-        return switcher != GSD_INPUT_SOURCES_SWITCHER_OFF;
-}
-
-static void
-settings_changed (GSettings          *settings,
-                  const char         *key,
-                  GsdKeyboardManager *manager)
-{
-	if (g_strcmp0 (key, KEY_CLICK) == 0||
-	    g_strcmp0 (key, KEY_CLICK_VOLUME) == 0 ||
-	    g_strcmp0 (key, KEY_BELL_PITCH) == 0 ||
-	    g_strcmp0 (key, KEY_BELL_DURATION) == 0 ||
-	    g_strcmp0 (key, KEY_BELL_MODE) == 0) {
-		g_debug ("Bell setting '%s' changed, applying bell settings", key);
-		apply_bell (manager);
-	} else if (g_strcmp0 (key, KEY_REMEMBER_NUMLOCK_STATE) == 0) {
-		g_debug ("Remember Num-Lock state '%s' changed, applying num-lock settings", key);
-		apply_numlock (manager);
-	} else if (g_strcmp0 (key, KEY_NUMLOCK_STATE) == 0) {
-		g_debug ("Num-Lock state '%s' changed, will apply at next startup", key);
-	} else if (g_strcmp0 (key, KEY_REPEAT) == 0 ||
-		 g_strcmp0 (key, KEY_INTERVAL) == 0 ||
-		 g_strcmp0 (key, KEY_DELAY) == 0) {
-		g_debug ("Key repeat setting '%s' changed, applying key repeat settings", key);
-		apply_repeat (manager);
-        } else if (g_strcmp0 (key, KEY_SWITCHER) == 0) {
-                set_input_sources_switcher (manager, enable_switcher (manager));
-	} else {
-		g_warning ("Unhandled settings change, key '%s'", key);
-	}
-
-}
-
-static void
-device_added_cb (GdkDeviceManager   *device_manager,
-                 GdkDevice          *device,
-                 GsdKeyboardManager *manager)
-{
-        GdkInputSource source;
-
-        source = gdk_device_get_source (device);
-        if (source == GDK_SOURCE_KEYBOARD) {
-                g_debug ("New keyboard plugged in, applying all settings");
-                apply_all_settings (manager);
-                apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
-                run_custom_command (device, COMMAND_DEVICE_ADDED);
-        }
-}
-
-static void
-device_removed_cb (GdkDeviceManager   *device_manager,
-                   GdkDevice          *device,
-                   GsdKeyboardManager *manager)
-{
-        GdkInputSource source;
-
-        source = gdk_device_get_source (device);
-        if (source == GDK_SOURCE_KEYBOARD) {
-                run_custom_command (device, COMMAND_DEVICE_REMOVED);
-        }
-}
-
-static void
-set_devicepresence_handler (GsdKeyboardManager *manager)
-{
-        GdkDeviceManager *device_manager;
-
-        device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
-
-        manager->priv->device_added_id = g_signal_connect (G_OBJECT (device_manager), "device-added",
-                                                           G_CALLBACK (device_added_cb), manager);
-        manager->priv->device_removed_id = g_signal_connect (G_OBJECT (device_manager), "device-removed",
-                                                             G_CALLBACK (device_removed_cb), manager);
-        manager->priv->device_manager = device_manager;
-}
-
-static void
-create_sources_from_current_xkb_config (GSettings *settings)
-{
-        GVariantBuilder builder;
-        XkbRF_VarDefsRec *xkb_var_defs;
-        gchar *tmp;
-        gchar **layouts = NULL;
-        gchar **variants = NULL;
-        guint i, n;
-
-        gnome_xkb_info_get_var_defs (&tmp, &xkb_var_defs);
-        g_free (tmp);
-
-        if (xkb_var_defs->layout)
-                layouts = g_strsplit (xkb_var_defs->layout, ",", 0);
-        if (xkb_var_defs->variant)
-                variants = g_strsplit (xkb_var_defs->variant, ",", 0);
-
-        gnome_xkb_info_free_var_defs (xkb_var_defs);
-
-        if (!layouts)
-                goto out;
-
-        if (variants && variants[0])
-                n = MIN (g_strv_length (layouts), g_strv_length (variants));
-        else
-                n = g_strv_length (layouts);
-
-        g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
-        for (i = 0; i < n && layouts[i][0]; ++i) {
-                if (variants && variants[i] && variants[i][0])
-                        tmp = g_strdup_printf ("%s+%s", layouts[i], variants[i]);
-                else
-                        tmp = g_strdup (layouts[i]);
-
-                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, tmp);
-                g_free (tmp);
-        }
-        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-out:
-        g_strfreev (layouts);
-        g_strfreev (variants);
-}
-
-static void
-convert_libgnomekbd_options (GSettings *settings)
-{
-        GPtrArray *opt_array;
-        GSettings *libgnomekbd_settings;
-        gchar **options, **o;
-
-        if (!schema_is_installed ("org.gnome.libgnomekbd.keyboard"))
-                return;
-
-        opt_array = g_ptr_array_new_with_free_func (g_free);
-
-        libgnomekbd_settings = g_settings_new ("org.gnome.libgnomekbd.keyboard");
-        options = g_settings_get_strv (libgnomekbd_settings, "options");
-
-        for (o = options; *o; ++o) {
-                gchar **strv;
-
-                strv = g_strsplit (*o, "\t", 2);
-                if (strv[0] && strv[1]) {
-                        /* We don't want the group switcher because
-                         * it's incompatible with the way we use XKB
-                         * groups. */
-                        if (!g_str_has_prefix (strv[1], "grp:"))
-                                g_ptr_array_add (opt_array, g_strdup (strv[1]));
-                }
-                g_strfreev (strv);
-        }
-        g_ptr_array_add (opt_array, NULL);
-
-        g_settings_set_strv (settings, KEY_KEYBOARD_OPTIONS, (const gchar * const*) opt_array->pdata);
-
-        g_strfreev (options);
-        g_object_unref (libgnomekbd_settings);
-        g_ptr_array_free (opt_array, TRUE);
-}
-
-static void
-convert_libgnomekbd_layouts (GSettings *settings)
-{
-        GVariantBuilder builder;
-        GSettings *libgnomekbd_settings;
-        gchar **layouts, **l;
-
-        if (!schema_is_installed ("org.gnome.libgnomekbd.keyboard"))
-                return;
-
-        init_builder_with_sources (&builder, settings);
-
-        libgnomekbd_settings = g_settings_new ("org.gnome.libgnomekbd.keyboard");
-        layouts = g_settings_get_strv (libgnomekbd_settings, "layouts");
-
-        for (l = layouts; *l; ++l) {
-                gchar *id;
-                gchar **strv;
-
-                strv = g_strsplit (*l, "\t", 2);
-                if (strv[0] && !strv[1])
-                        id = g_strdup (strv[0]);
-                else if (strv[0] && strv[1])
-                        id = g_strdup_printf ("%s+%s", strv[0], strv[1]);
-                else
-                        id = NULL;
-
-                if (id)
-                        g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, id);
-
-                g_free (id);
-                g_strfreev (strv);
-        }
-
-        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-
-        g_strfreev (layouts);
-        g_object_unref (libgnomekbd_settings);
-}
-
-static void
-maybe_convert_old_settings (GSettings *settings)
-{
-        GVariant *sources;
-        gchar **options;
-        gchar *stamp_dir_path = NULL;
-        gchar *stamp_file_path = NULL;
-        GError *error = NULL;
-
-        stamp_dir_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, NULL);
-        if (g_mkdir_with_parents (stamp_dir_path, 0755)) {
-                g_warning ("Failed to create directory %s: %s", stamp_dir_path, g_strerror (errno));
-                goto out;
-        }
-
-        stamp_file_path = g_build_filename (stamp_dir_path, "input-sources-converted", NULL);
-        if (g_file_test (stamp_file_path, G_FILE_TEST_EXISTS))
-                goto out;
-
-        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
-        if (g_variant_n_children (sources) < 1) {
-                convert_libgnomekbd_layouts (settings);
-#ifdef HAVE_IBUS
-                convert_ibus (settings);
-#endif
-        }
-        g_variant_unref (sources);
-
-        options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
-        if (g_strv_length (options) < 1)
-                convert_libgnomekbd_options (settings);
-        g_strfreev (options);
-
-        if (!g_file_set_contents (stamp_file_path, "", 0, &error)) {
-                g_warning ("%s", error->message);
-                g_error_free (error);
-        }
-out:
-        g_free (stamp_file_path);
-        g_free (stamp_dir_path);
-}
-
-static void
-maybe_create_input_sources (GsdKeyboardManager *manager)
-{
-        GSettings *settings;
-        GVariant *sources;
-
-        settings = manager->priv->input_sources_settings;
-
-        if (g_getenv ("RUNNING_UNDER_GDM")) {
-                create_sources_from_current_xkb_config (settings);
-                return;
-        }
-
-        maybe_convert_old_settings (settings);
-
-        /* if we still don't have anything do some educated guesses */
-        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
-        if (g_variant_n_children (sources) < 1) {
-                create_sources_from_current_xkb_config (settings);
-#ifdef HAVE_IBUS
-                add_ibus_sources_from_locale (settings);
-#endif
-        }
-        g_variant_unref (sources);
-}
-
-static gboolean
-start_keyboard_idle_cb (GsdKeyboardManager *manager)
-{
-        gnome_settings_profile_start (NULL);
-
-        g_debug ("Starting keyboard manager");
-
-        manager->priv->settings = g_settings_new (GSD_KEYBOARD_DIR);
-
-	xkb_init (manager);
-
-	set_devicepresence_handler (manager);
-
-        manager->priv->input_sources_settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
-        manager->priv->interface_settings = g_settings_new (GNOME_DESKTOP_INTERFACE_DIR);
-        manager->priv->xkb_info = gnome_xkb_info_new ();
-
-        maybe_create_input_sources (manager);
-
-#ifdef HAVE_IBUS
-        /* We don't want to touch IBus until we are sure this isn't a
-           fallback session. */
-        manager->priv->session_is_fallback = TRUE;
-        manager->priv->ibus_cancellable = g_cancellable_new ();
-        g_bus_get (G_BUS_TYPE_SESSION,
-                   manager->priv->ibus_cancellable,
-                   (GAsyncReadyCallback)got_bus,
-                   manager);
-#else
-        apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
-#endif
-        /* apply current settings before we install the callback */
-        g_debug ("Started the keyboard plugin, applying all settings");
-        apply_all_settings (manager);
-
-        g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
-                          G_CALLBACK (settings_changed), manager);
-        g_signal_connect (G_OBJECT (manager->priv->input_sources_settings), "change-event",
-                          G_CALLBACK (apply_input_sources_settings), manager);
-
-	install_xkb_filter (manager);
-        set_input_sources_switcher (manager, enable_switcher (manager));
-
-        gnome_settings_profile_end (NULL);
-
-        manager->priv->start_idle_id = 0;
-
-        return FALSE;
-}
-
-gboolean
-gsd_keyboard_manager_start (GsdKeyboardManager *manager,
-                            GError            **error)
-{
-        gnome_settings_profile_start (NULL);
-
-	if (check_xkb_extension (manager) == FALSE) {
-		g_debug ("XKB is not supported, not applying any settings");
-		return TRUE;
-	}
-
-        manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_keyboard_idle_cb, manager);
-
-        gnome_settings_profile_end (NULL);
-
-        return TRUE;
-}
-
-void
-gsd_keyboard_manager_stop (GsdKeyboardManager *manager)
-{
-        GsdKeyboardManagerPrivate *p = manager->priv;
-
-        g_debug ("Stopping keyboard manager");
-
-        g_clear_object (&p->settings);
-        g_clear_object (&p->input_sources_settings);
-        g_clear_object (&p->interface_settings);
-        g_clear_object (&p->xkb_info);
-
-#ifdef HAVE_IBUS
-        clear_ibus (manager);
-#endif
-
-        if (p->device_manager != NULL) {
-                g_signal_handler_disconnect (p->device_manager, p->device_added_id);
-                g_signal_handler_disconnect (p->device_manager, p->device_removed_id);
-                p->device_manager = NULL;
-        }
-
-	remove_xkb_filter (manager);
-
-        set_input_sources_switcher (manager, FALSE);
-}
-
-static void
-gsd_keyboard_manager_class_init (GsdKeyboardManagerClass *klass)
-{
-        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-
-        object_class->finalize = gsd_keyboard_manager_finalize;
-
-        g_type_class_add_private (klass, sizeof (GsdKeyboardManagerPrivate));
-}
-
-static void
-gsd_keyboard_manager_init (GsdKeyboardManager *manager)
-{
-        manager->priv = GSD_KEYBOARD_MANAGER_GET_PRIVATE (manager);
-}
-
-static void
-gsd_keyboard_manager_finalize (GObject *object)
-{
-        GsdKeyboardManager *keyboard_manager;
-
-        g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_KEYBOARD_MANAGER (object));
-
-        keyboard_manager = GSD_KEYBOARD_MANAGER (object);
-
-        g_return_if_fail (keyboard_manager->priv != NULL);
-
-        if (keyboard_manager->priv->start_idle_id != 0)
-                g_source_remove (keyboard_manager->priv->start_idle_id);
-
-        G_OBJECT_CLASS (gsd_keyboard_manager_parent_class)->finalize (object);
-}
-
-GsdKeyboardManager *
-gsd_keyboard_manager_new (void)
-{
-        if (manager_object != NULL) {
-                g_object_ref (manager_object);
-        } else {
-                manager_object = g_object_new (GSD_TYPE_KEYBOARD_MANAGER, NULL);
-                g_object_add_weak_pointer (manager_object,
-                                           (gpointer *) &manager_object);
-        }
-
-        return GSD_KEYBOARD_MANAGER (manager_object);
-}

=== added directory '.pc/tune-syndaemon.patch'
=== added file '.pc/tune-syndaemon.patch/.timestamp'
=== added directory '.pc/tune-syndaemon.patch/plugins'
=== added directory '.pc/tune-syndaemon.patch/plugins/mouse'
=== added file '.pc/tune-syndaemon.patch/plugins/mouse/gsd-mouse-manager.c'
--- .pc/tune-syndaemon.patch/plugins/mouse/gsd-mouse-manager.c	1970-01-01 00:00:00 +0000
+++ .pc/tune-syndaemon.patch/plugins/mouse/gsd-mouse-manager.c	2013-08-29 18:58:42 +0000
@@ -0,0 +1,1354 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <math.h>
+#ifdef __linux
+#include <sys/prctl.h>
+#endif
+
+#include <locale.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+#include <X11/keysym.h>
+#include <X11/Xatom.h>
+
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XIproto.h>
+
+#include "gnome-settings-profile.h"
+#include "gsd-mouse-manager.h"
+#include "gsd-input-helper.h"
+#include "gsd-enums.h"
+
+#define GSD_MOUSE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUSE_MANAGER, GsdMouseManagerPrivate))
+
+#define SETTINGS_MOUSE_DIR         "org.gnome.settings-daemon.peripherals.mouse"
+#define SETTINGS_TOUCHPAD_DIR      "org.gnome.settings-daemon.peripherals.touchpad"
+
+/* Keys for both touchpad and mouse */
+#define KEY_LEFT_HANDED         "left-handed"                /* a boolean for mouse, an enum for touchpad */
+#define KEY_MOTION_ACCELERATION "motion-acceleration"
+#define KEY_MOTION_THRESHOLD    "motion-threshold"
+
+/* Touchpad settings */
+#define KEY_TOUCHPAD_DISABLE_W_TYPING    "disable-while-typing"
+#define KEY_PAD_HORIZ_SCROLL             "horiz-scroll-enabled"
+#define KEY_SCROLL_METHOD                "scroll-method"
+#define KEY_TAP_TO_CLICK                 "tap-to-click"
+#define KEY_TOUCHPAD_ENABLED             "touchpad-enabled"
+#define KEY_NATURAL_SCROLL_ENABLED       "natural-scroll"
+
+/* Mouse settings */
+#define KEY_LOCATE_POINTER               "locate-pointer"
+#define KEY_DWELL_CLICK_ENABLED          "dwell-click-enabled"
+#define KEY_SECONDARY_CLICK_ENABLED      "secondary-click-enabled"
+#define KEY_MIDDLE_BUTTON_EMULATION      "middle-button-enabled"
+
+struct GsdMouseManagerPrivate
+{
+        guint start_idle_id;
+        GSettings *touchpad_settings;
+        GSettings *mouse_settings;
+        GSettings *mouse_a11y_settings;
+        GdkDeviceManager *device_manager;
+        guint device_added_id;
+        guint device_removed_id;
+        GHashTable *blacklist;
+
+        gboolean mousetweaks_daemon_running;
+        gboolean syndaemon_spawned;
+        GPid syndaemon_pid;
+        gboolean locate_pointer_spawned;
+        GPid locate_pointer_pid;
+};
+
+static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
+static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manager);
+static void     gsd_mouse_manager_finalize    (GObject             *object);
+static void     set_tap_to_click              (GdkDevice           *device,
+                                               gboolean             state,
+                                               gboolean             left_handed);
+static void     set_natural_scroll            (GsdMouseManager *manager,
+                                               GdkDevice       *device,
+                                               gboolean         natural_scroll);
+
+G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
+
+static gpointer manager_object = NULL;
+
+
+static GObject *
+gsd_mouse_manager_constructor (GType                  type,
+                              guint                  n_construct_properties,
+                              GObjectConstructParam *construct_properties)
+{
+        GsdMouseManager      *mouse_manager;
+
+        mouse_manager = GSD_MOUSE_MANAGER (G_OBJECT_CLASS (gsd_mouse_manager_parent_class)->constructor (type,
+                                                                                                      n_construct_properties,
+                                                                                                      construct_properties));
+
+        return G_OBJECT (mouse_manager);
+}
+
+static void
+gsd_mouse_manager_dispose (GObject *object)
+{
+        G_OBJECT_CLASS (gsd_mouse_manager_parent_class)->dispose (object);
+}
+
+static void
+gsd_mouse_manager_class_init (GsdMouseManagerClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+
+        object_class->constructor = gsd_mouse_manager_constructor;
+        object_class->dispose = gsd_mouse_manager_dispose;
+        object_class->finalize = gsd_mouse_manager_finalize;
+
+        g_type_class_add_private (klass, sizeof (GsdMouseManagerPrivate));
+}
+
+static XDevice *
+open_gdk_device (GdkDevice *device)
+{
+        XDevice *xdevice;
+        int id;
+
+        g_object_get (G_OBJECT (device), "device-id", &id, NULL);
+
+        gdk_error_trap_push ();
+
+        xdevice = XOpenDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), id);
+
+        if (gdk_error_trap_pop () != 0)
+                return NULL;
+
+        return xdevice;
+}
+
+static gboolean
+device_is_blacklisted (GsdMouseManager *manager,
+                       GdkDevice       *device)
+{
+        int id;
+        g_object_get (G_OBJECT (device), "device-id", &id, NULL);
+        if (g_hash_table_lookup (manager->priv->blacklist, GINT_TO_POINTER (id)) != NULL) {
+                g_debug ("device %s (%d) is blacklisted", gdk_device_get_name (device), id);
+                return TRUE;
+        }
+        return FALSE;
+}
+
+static gboolean
+device_is_ignored (GsdMouseManager *manager,
+		   GdkDevice       *device)
+{
+	GdkInputSource source;
+	const char *name;
+
+	if (device_is_blacklisted (manager, device))
+		return TRUE;
+
+	source = gdk_device_get_source (device);
+	if (source != GDK_SOURCE_MOUSE &&
+	    source != GDK_SOURCE_TOUCHPAD &&
+	    source != GDK_SOURCE_CURSOR)
+		return TRUE;
+
+	name = gdk_device_get_name (device);
+	if (name != NULL && g_str_equal ("Virtual core XTEST pointer", name))
+		return TRUE;
+
+	return FALSE;
+}
+
+static void
+configure_button_layout (guchar   *buttons,
+                         gint      n_buttons,
+                         gboolean  left_handed)
+{
+        const gint left_button = 1;
+        gint right_button;
+        gint i;
+
+        /* if the button is higher than 2 (3rd button) then it's
+         * probably one direction of a scroll wheel or something else
+         * uninteresting
+         */
+        right_button = MIN (n_buttons, 3);
+
+        /* If we change things we need to make sure we only swap buttons.
+         * If we end up with multiple physical buttons assigned to the same
+         * logical button the server will complain. This code assumes physical
+         * button 0 is the physical left mouse button, and that the physical
+         * button other than 0 currently assigned left_button or right_button
+         * is the physical right mouse button.
+         */
+
+        /* check if the current mapping satisfies the above assumptions */
+        if (buttons[left_button - 1] != left_button &&
+            buttons[left_button - 1] != right_button)
+                /* The current mapping is weird. Swapping buttons is probably not a
+                 * good idea.
+                 */
+                return;
+
+        /* check if we are left_handed and currently not swapped */
+        if (left_handed && buttons[left_button - 1] == left_button) {
+                /* find the right button */
+                for (i = 0; i < n_buttons; i++) {
+                        if (buttons[i] == right_button) {
+                                buttons[i] = left_button;
+                                break;
+                        }
+                }
+                /* swap the buttons */
+                buttons[left_button - 1] = right_button;
+        }
+        /* check if we are not left_handed but are swapped */
+        else if (!left_handed && buttons[left_button - 1] == right_button) {
+                /* find the right button */
+                for (i = 0; i < n_buttons; i++) {
+                        if (buttons[i] == left_button) {
+                                buttons[i] = right_button;
+                                break;
+                        }
+                }
+                /* swap the buttons */
+                buttons[left_button - 1] = left_button;
+        }
+}
+
+static gboolean
+xinput_device_has_buttons (GdkDevice *device)
+{
+        int i;
+        XAnyClassInfo *class_info;
+
+        /* FIXME can we use the XDevice's classes here instead? */
+        XDeviceInfo *device_info, *info;
+        gint n_devices;
+        int id;
+
+        /* Find the XDeviceInfo for the GdkDevice */
+        g_object_get (G_OBJECT (device), "device-id", &id, NULL);
+
+        device_info = XListInputDevices (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &n_devices);
+        if (device_info == NULL)
+                return FALSE;
+
+        info = NULL;
+        for (i = 0; i < n_devices; i++) {
+                if (device_info[i].id == id) {
+                        info = &device_info[i];
+                        break;
+                }
+        }
+        if (info == NULL)
+                goto bail;
+
+        class_info = info->inputclassinfo;
+        for (i = 0; i < info->num_classes; i++) {
+                if (class_info->class == ButtonClass) {
+                        XButtonInfo *button_info;
+
+                        button_info = (XButtonInfo *) class_info;
+                        if (button_info->num_buttons > 0) {
+                                XFreeDeviceList (device_info);
+                                return TRUE;
+                        }
+                }
+
+                class_info = (XAnyClassInfo *) (((guchar *) class_info) +
+                                                class_info->length);
+        }
+
+bail:
+        XFreeDeviceList (device_info);
+
+        return FALSE;
+}
+
+static gboolean
+touchpad_has_single_button (XDevice *device)
+{
+        Atom type, prop;
+        int format;
+        unsigned long nitems, bytes_after;
+        unsigned char *data;
+        gboolean is_single_button = FALSE;
+        int rc;
+
+        prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Capabilities", False);
+        if (!prop)
+                return FALSE;
+
+        gdk_error_trap_push ();
+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device, prop, 0, 1, False,
+                                XA_INTEGER, &type, &format, &nitems,
+                                &bytes_after, &data);
+        if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 3)
+                is_single_button = (data[0] == 1 && data[1] == 0 && data[2] == 0);
+
+        if (rc == Success)
+                XFree (data);
+
+        gdk_error_trap_pop_ignored ();
+
+        return is_single_button;
+}
+
+static void
+set_left_handed (GsdMouseManager *manager,
+                 GdkDevice       *device,
+                 gboolean mouse_left_handed,
+                 gboolean touchpad_left_handed)
+{
+        XDevice *xdevice;
+        guchar *buttons;
+        gsize buttons_capacity = 16;
+        gboolean left_handed;
+        gint n_buttons;
+
+        if (!xinput_device_has_buttons (device))
+                return;
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+	g_debug ("setting handedness on %s", gdk_device_get_name (device));
+
+        buttons = g_new (guchar, buttons_capacity);
+
+        /* If the device is a touchpad, swap tap buttons
+         * around too, otherwise a tap would be a right-click */
+        if (device_is_touchpad (xdevice)) {
+                gboolean tap = g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TAP_TO_CLICK);
+                gboolean single_button = touchpad_has_single_button (xdevice);
+
+                left_handed = touchpad_left_handed;
+
+                if (tap && !single_button)
+                        set_tap_to_click (device, tap, left_handed);
+
+                if (single_button)
+                        goto out;
+        } else {
+                left_handed = mouse_left_handed;
+        }
+
+        n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                             buttons,
+                                             buttons_capacity);
+
+        while (n_buttons > buttons_capacity) {
+                buttons_capacity = n_buttons;
+                buttons = (guchar *) g_realloc (buttons,
+                                                buttons_capacity * sizeof (guchar));
+
+                n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                                     buttons,
+                                                     buttons_capacity);
+        }
+
+        configure_button_layout (buttons, n_buttons, left_handed);
+
+	gdk_error_trap_push ();
+        XSetDeviceButtonMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice, buttons, n_buttons);
+        gdk_error_trap_pop_ignored ();
+
+out:
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+        g_free (buttons);
+}
+
+static void
+set_motion (GsdMouseManager *manager,
+            GdkDevice       *device)
+{
+        XDevice *xdevice;
+        XPtrFeedbackControl feedback;
+        XFeedbackState *states, *state;
+        int num_feedbacks;
+        int numerator, denominator;
+        gfloat motion_acceleration;
+        int motion_threshold;
+        GSettings *settings;
+        guint i;
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+	g_debug ("setting motion on %s", gdk_device_get_name (device));
+
+        if (device_is_touchpad (xdevice))
+                settings = manager->priv->touchpad_settings;
+        else
+                settings = manager->priv->mouse_settings;
+
+        /* Calculate acceleration */
+        motion_acceleration = g_settings_get_double (settings, KEY_MOTION_ACCELERATION);
+
+        if (motion_acceleration >= 1.0) {
+                /* we want to get the acceleration, with a resolution of 0.5
+                 */
+                if ((motion_acceleration - floor (motion_acceleration)) < 0.25) {
+                        numerator = floor (motion_acceleration);
+                        denominator = 1;
+                } else if ((motion_acceleration - floor (motion_acceleration)) < 0.5) {
+                        numerator = ceil (2.0 * motion_acceleration);
+                        denominator = 2;
+                } else if ((motion_acceleration - floor (motion_acceleration)) < 0.75) {
+                        numerator = floor (2.0 *motion_acceleration);
+                        denominator = 2;
+                } else {
+                        numerator = ceil (motion_acceleration);
+                        denominator = 1;
+                }
+        } else if (motion_acceleration < 1.0 && motion_acceleration > 0) {
+                /* This we do to 1/10ths */
+                numerator = floor (motion_acceleration * 10) + 1;
+                denominator= 10;
+        } else {
+                numerator = -1;
+                denominator = -1;
+        }
+
+        /* And threshold */
+        motion_threshold = g_settings_get_int (settings, KEY_MOTION_THRESHOLD);
+
+        /* Get the list of feedbacks for the device */
+        states = XGetFeedbackControl (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice, &num_feedbacks);
+        if (states == NULL)
+                goto out;
+        state = (XFeedbackState *) states;
+        for (i = 0; i < num_feedbacks; i++) {
+                if (state->class == PtrFeedbackClass) {
+                        /* And tell the device */
+                        feedback.class      = PtrFeedbackClass;
+                        feedback.length     = sizeof (XPtrFeedbackControl);
+                        feedback.id         = state->id;
+                        feedback.threshold  = motion_threshold;
+                        feedback.accelNum   = numerator;
+                        feedback.accelDenom = denominator;
+
+                        g_debug ("Setting accel %d/%d, threshold %d for device '%s'",
+                                 numerator, denominator, motion_threshold, gdk_device_get_name (device));
+
+                        XChangeFeedbackControl (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                                                xdevice,
+                                                DvAccelNum | DvAccelDenom | DvThreshold,
+                                                (XFeedbackControl *) &feedback);
+
+                        break;
+                }
+                state = (XFeedbackState *) ((char *) state + state->length);
+        }
+
+        XFreeFeedbackList (states);
+
+    out:
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+}
+
+static void
+set_middle_button (GsdMouseManager *manager,
+                   GdkDevice       *device,
+                   gboolean         middle_button)
+{
+        Atom prop;
+        XDevice *xdevice;
+        Atom type;
+        int format;
+        unsigned long nitems, bytes_after;
+        unsigned char *data;
+        int rc;
+
+        prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                            "Evdev Middle Button Emulation", True);
+
+        if (!prop) /* no evdev devices */
+                return;
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+	g_debug ("setting middle button on %s", gdk_device_get_name (device));
+
+        gdk_error_trap_push ();
+
+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                            xdevice, prop, 0, 1, False, XA_INTEGER, &type, &format,
+                            &nitems, &bytes_after, &data);
+
+        if (rc == Success && format == 8 && type == XA_INTEGER && nitems == 1) {
+                data[0] = middle_button ? 1 : 0;
+
+                XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                                       xdevice, prop, type, format, PropModeReplace, data, nitems);
+        }
+
+        if (gdk_error_trap_pop ())
+                g_warning ("Error in setting middle button emulation on \"%s\"", gdk_device_get_name (device));
+
+        if (rc == Success)
+                XFree (data);
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+}
+
+/* Ensure that syndaemon dies together with us, to avoid running several of
+ * them */
+static void
+setup_syndaemon (gpointer user_data)
+{
+#ifdef __linux
+        prctl (PR_SET_PDEATHSIG, SIGHUP);
+#endif
+}
+
+static gboolean
+have_program_in_path (const char *name)
+{
+        gchar *path;
+        gboolean result;
+
+        path = g_find_program_in_path (name);
+        result = (path != NULL);
+        g_free (path);
+        return result;
+}
+
+static void
+syndaemon_died (GPid pid, gint status, gpointer user_data)
+{
+        GsdMouseManager *manager = GSD_MOUSE_MANAGER (user_data);
+
+        g_debug ("syndaemon stopped with status %i", status);
+        g_spawn_close_pid (pid);
+        manager->priv->syndaemon_spawned = FALSE;
+}
+
+static int
+set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+{
+        if (state && touchpad_is_present ()) {
+                GError *error = NULL;
+                GPtrArray *args;
+
+                if (manager->priv->syndaemon_spawned)
+                        return 0;
+
+                if (!have_program_in_path ("syndaemon"))
+                        return 0;
+
+                args = g_ptr_array_new ();
+
+                g_ptr_array_add (args, "syndaemon");
+                g_ptr_array_add (args, "-i");
+                g_ptr_array_add (args, "1.0");
+                g_ptr_array_add (args, "-t");
+                g_ptr_array_add (args, "-K");
+                g_ptr_array_add (args, "-R");
+                g_ptr_array_add (args, NULL);
+
+                /* we must use G_SPAWN_DO_NOT_REAP_CHILD to avoid
+                 * double-forking, otherwise syndaemon will immediately get
+                 * killed again through (PR_SET_PDEATHSIG when the intermediate
+                 * process dies */
+                g_spawn_async (g_get_home_dir (), (char **) args->pdata, NULL,
+                                G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD, setup_syndaemon, NULL,
+                                &manager->priv->syndaemon_pid, &error);
+
+                manager->priv->syndaemon_spawned = (error == NULL);
+                g_ptr_array_free (args, FALSE);
+
+                if (error) {
+                        g_warning ("Failed to launch syndaemon: %s", error->message);
+                        g_settings_set_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_DISABLE_W_TYPING, FALSE);
+                        g_error_free (error);
+                } else {
+                        g_child_watch_add (manager->priv->syndaemon_pid, syndaemon_died, manager);
+                        g_debug ("Launched syndaemon");
+                }
+        } else if (manager->priv->syndaemon_spawned) {
+                kill (manager->priv->syndaemon_pid, SIGHUP);
+                g_spawn_close_pid (manager->priv->syndaemon_pid);
+                manager->priv->syndaemon_spawned = FALSE;
+                g_debug ("Killed syndaemon");
+        }
+
+        return 0;
+}
+
+static void
+set_tap_to_click (GdkDevice *device,
+                  gboolean   state,
+                  gboolean   left_handed)
+{
+        int format, rc;
+        unsigned long nitems, bytes_after;
+        XDevice *xdevice;
+        unsigned char* data;
+        Atom prop, type;
+
+        prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Tap Action", False);
+        if (!prop)
+                return;
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+        if (!device_is_touchpad (xdevice)) {
+                XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+                return;
+        }
+
+	g_debug ("setting tap to click on %s", gdk_device_get_name (device));
+
+        gdk_error_trap_push ();
+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice, prop, 0, 2,
+                                 False, XA_INTEGER, &type, &format, &nitems,
+                                 &bytes_after, &data);
+
+        if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 7) {
+               /* Set MR mapping for corner tapping on the right side*/
+               data[0] = (state) ? 2 : 0;
+               data[1] = (state) ? 3 : 0;
+
+                /* Set RLM mapping for 1/2/3 fingers*/
+                data[4] = (state) ? ((left_handed) ? 3 : 1) : 0;
+                data[5] = (state) ? ((left_handed) ? 1 : 3) : 0;
+                data[6] = 0; /* Disable three touch tap so gestures work */
+                XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice, prop, XA_INTEGER, 8,
+                                       PropModeReplace, data, nitems);
+        }
+
+        if (rc == Success)
+                XFree (data);
+
+        if (gdk_error_trap_pop ())
+                g_warning ("Error in setting tap to click on \"%s\"", gdk_device_get_name (device));
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+}
+
+static void
+set_horiz_scroll (GdkDevice *device,
+                  gboolean   state)
+{
+        int rc;
+        XDevice *xdevice;
+        Atom act_type, prop_edge, prop_twofinger;
+        int act_format;
+        unsigned long nitems, bytes_after;
+        unsigned char *data;
+
+        prop_edge = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Edge Scrolling", False);
+        prop_twofinger = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Two-Finger Scrolling", False);
+
+        if (!prop_edge || !prop_twofinger)
+                return;
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+        if (!device_is_touchpad (xdevice)) {
+                XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+                return;
+        }
+
+	g_debug ("setting horiz scroll on %s", gdk_device_get_name (device));
+
+        gdk_error_trap_push ();
+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                 prop_edge, 0, 1, False,
+                                 XA_INTEGER, &act_type, &act_format, &nitems,
+                                 &bytes_after, &data);
+        if (rc == Success && act_type == XA_INTEGER &&
+            act_format == 8 && nitems >= 2) {
+                data[1] = (state && data[0]);
+                XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                       prop_edge, XA_INTEGER, 8,
+                                       PropModeReplace, data, nitems);
+        }
+
+        XFree (data);
+
+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                 prop_twofinger, 0, 1, False,
+                                 XA_INTEGER, &act_type, &act_format, &nitems,
+                                 &bytes_after, &data);
+        if (rc == Success && act_type == XA_INTEGER &&
+            act_format == 8 && nitems >= 2) {
+                data[1] = (state && data[0]);
+                XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                       prop_twofinger, XA_INTEGER, 8,
+                                       PropModeReplace, data, nitems);
+        }
+
+        if (gdk_error_trap_pop ())
+                g_warning ("Error in setting horiz scroll on \"%s\"", gdk_device_get_name (device));
+
+        if (rc == Success)
+                XFree (data);
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+
+}
+
+static void
+set_edge_scroll (GdkDevice               *device,
+                 GsdTouchpadScrollMethod  method)
+{
+        int rc;
+        XDevice *xdevice;
+        Atom act_type, prop_edge, prop_twofinger;
+        int act_format;
+        unsigned long nitems, bytes_after;
+        unsigned char *data;
+
+        prop_edge = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Edge Scrolling", False);
+        prop_twofinger = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Two-Finger Scrolling", False);
+
+        if (!prop_edge || !prop_twofinger)
+                return;
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+        if (!device_is_touchpad (xdevice)) {
+                XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+                return;
+        }
+
+	g_debug ("setting edge scroll on %s", gdk_device_get_name (device));
+
+        gdk_error_trap_push ();
+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                 prop_edge, 0, 1, False,
+                                 XA_INTEGER, &act_type, &act_format, &nitems,
+                                 &bytes_after, &data);
+        if (rc == Success && act_type == XA_INTEGER &&
+            act_format == 8 && nitems >= 2) {
+                data[0] = (method == GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING) ? 1 : 0;
+                XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                       prop_edge, XA_INTEGER, 8,
+                                       PropModeReplace, data, nitems);
+        }
+
+        XFree (data);
+
+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                 prop_twofinger, 0, 1, False,
+                                 XA_INTEGER, &act_type, &act_format, &nitems,
+                                 &bytes_after, &data);
+        if (rc == Success && act_type == XA_INTEGER &&
+            act_format == 8 && nitems >= 2) {
+                data[0] = (method == GSD_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING) ? 1 : 0;
+                XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                       prop_twofinger, XA_INTEGER, 8,
+                                       PropModeReplace, data, nitems);
+        }
+
+        if (gdk_error_trap_pop ())
+                g_warning ("Error in setting edge scroll on \"%s\"", gdk_device_get_name (device));
+
+        if (rc == Success)
+                XFree (data);
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+}
+
+static void
+set_touchpad_disabled (GdkDevice *device)
+{
+        int id;
+        XDevice *xdevice;
+
+        g_object_get (G_OBJECT (device), "device-id", &id, NULL);
+
+        g_debug ("Trying to set device disabled for \"%s\" (%d)", gdk_device_get_name (device), id);
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+        if (!device_is_touchpad (xdevice)) {
+                XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+                return;
+        }
+
+        if (set_device_enabled (id, FALSE) == FALSE)
+                g_warning ("Error disabling device \"%s\" (%d)", gdk_device_get_name (device), id);
+        else
+                g_debug ("Disabled device \"%s\" (%d)", gdk_device_get_name (device), id);
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+}
+
+static void
+set_touchpad_enabled (int id)
+{
+        XDevice *xdevice;
+
+        g_debug ("Trying to set device enabled for %d", id);
+
+        gdk_error_trap_push ();
+        xdevice = XOpenDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), id);
+        if (gdk_error_trap_pop () != 0)
+                return;
+
+        if (!device_is_touchpad (xdevice)) {
+                XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+                return;
+        }
+
+        if (set_device_enabled (id, TRUE) == FALSE)
+                g_warning ("Error enabling device \"%d\"", id);
+        else
+                g_debug ("Enabled device %d", id);
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+}
+
+static void
+set_locate_pointer (GsdMouseManager *manager,
+                    gboolean         state)
+{
+        if (state) {
+                GError *error = NULL;
+                char *args[2];
+
+                if (manager->priv->locate_pointer_spawned)
+                        return;
+
+                args[0] = LIBEXECDIR "/gsd-locate-pointer";
+                args[1] = NULL;
+
+                g_spawn_async (NULL, args, NULL,
+                               0, NULL, NULL,
+                               &manager->priv->locate_pointer_pid, &error);
+
+                manager->priv->locate_pointer_spawned = (error == NULL);
+
+                if (error) {
+                        g_settings_set_boolean (manager->priv->mouse_settings, KEY_LOCATE_POINTER, FALSE);
+                        g_error_free (error);
+                }
+
+        } else if (manager->priv->locate_pointer_spawned) {
+                kill (manager->priv->locate_pointer_pid, SIGHUP);
+                g_spawn_close_pid (manager->priv->locate_pointer_pid);
+                manager->priv->locate_pointer_spawned = FALSE;
+        }
+}
+
+static void
+set_mousetweaks_daemon (GsdMouseManager *manager,
+                        gboolean         dwell_click_enabled,
+                        gboolean         secondary_click_enabled)
+{
+        GError *error = NULL;
+        gchar *comm;
+        gboolean run_daemon = dwell_click_enabled || secondary_click_enabled;
+
+        if (run_daemon || manager->priv->mousetweaks_daemon_running)
+                comm = g_strdup_printf ("mousetweaks %s",
+                                        run_daemon ? "" : "-s");
+        else
+                return;
+
+        if (run_daemon)
+                manager->priv->mousetweaks_daemon_running = TRUE;
+
+        if (! g_spawn_command_line_async (comm, &error)) {
+                if (error->code == G_SPAWN_ERROR_NOENT && run_daemon) {
+                        GtkWidget *dialog;
+
+                        if (dwell_click_enabled) {
+                                g_settings_set_boolean (manager->priv->mouse_a11y_settings,
+                                                        KEY_DWELL_CLICK_ENABLED, FALSE);
+                        } else if (secondary_click_enabled) {
+                                g_settings_set_boolean (manager->priv->mouse_a11y_settings,
+                                                        KEY_SECONDARY_CLICK_ENABLED, FALSE);
+                        }
+
+                        dialog = gtk_message_dialog_new (NULL, 0,
+                                                         GTK_MESSAGE_WARNING,
+                                                         GTK_BUTTONS_OK,
+                                                         _("Could not enable mouse accessibility features"));
+                        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                                  _("Mouse accessibility requires Mousetweaks "
+                                                                    "to be installed on your system."));
+                        gtk_window_set_title (GTK_WINDOW (dialog), _("Universal Access"));
+                        gtk_window_set_icon_name (GTK_WINDOW (dialog),
+                                                  "preferences-desktop-accessibility");
+                        gtk_dialog_run (GTK_DIALOG (dialog));
+                        gtk_widget_destroy (dialog);
+                }
+                g_error_free (error);
+        }
+        g_free (comm);
+}
+
+static gboolean
+get_touchpad_handedness (GsdMouseManager *manager, gboolean mouse_left_handed)
+{
+        switch (g_settings_get_enum (manager->priv->touchpad_settings, KEY_LEFT_HANDED)) {
+        case GSD_TOUCHPAD_HANDEDNESS_RIGHT:
+                return FALSE;
+        case GSD_TOUCHPAD_HANDEDNESS_LEFT:
+                return TRUE;
+        case GSD_TOUCHPAD_HANDEDNESS_MOUSE:
+                return mouse_left_handed;
+        default:
+                g_assert_not_reached ();
+        }
+}
+
+static void
+set_mouse_settings (GsdMouseManager *manager,
+                    GdkDevice       *device)
+{
+        gboolean mouse_left_handed, touchpad_left_handed;
+
+        mouse_left_handed = g_settings_get_boolean (manager->priv->mouse_settings, KEY_LEFT_HANDED);
+        touchpad_left_handed = get_touchpad_handedness (manager, mouse_left_handed);
+        set_left_handed (manager, device, mouse_left_handed, touchpad_left_handed);
+
+        set_motion (manager, device);
+        set_middle_button (manager, device, g_settings_get_boolean (manager->priv->mouse_settings, KEY_MIDDLE_BUTTON_EMULATION));
+
+        set_tap_to_click (device, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TAP_TO_CLICK), touchpad_left_handed);
+        set_edge_scroll (device, g_settings_get_enum (manager->priv->touchpad_settings, KEY_SCROLL_METHOD));
+        set_horiz_scroll (device, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_PAD_HORIZ_SCROLL));
+        set_natural_scroll (manager, device, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_NATURAL_SCROLL_ENABLED));
+        if (g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_ENABLED) == FALSE)
+                set_touchpad_disabled (device);
+}
+
+static void
+set_natural_scroll (GsdMouseManager *manager,
+                    GdkDevice       *device,
+                    gboolean         natural_scroll)
+{
+        XDevice *xdevice;
+        Atom scrolling_distance, act_type;
+        int rc, act_format;
+        unsigned long nitems, bytes_after;
+        unsigned char *data;
+        glong *ptr;
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+        if (!device_is_touchpad (xdevice)) {
+                XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+                return;
+        }
+
+        g_debug ("Trying to set %s for \"%s\"",
+                 natural_scroll ? "natural (reverse) scroll" : "normal scroll",
+                 gdk_device_get_name (device));
+
+        scrolling_distance = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                                          "Synaptics Scrolling Distance", False);
+
+        gdk_error_trap_push ();
+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                 scrolling_distance, 0, 2, False,
+                                 XA_INTEGER, &act_type, &act_format, &nitems,
+                                 &bytes_after, &data);
+
+        if (rc == Success && act_type == XA_INTEGER && act_format == 32 && nitems >= 2) {
+                ptr = (glong *) data;
+
+                if (natural_scroll) {
+                        ptr[0] = -abs(ptr[0]);
+                        ptr[1] = -abs(ptr[1]);
+                } else {
+                        ptr[0] = abs(ptr[0]);
+                        ptr[1] = abs(ptr[1]);
+                }
+
+                XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
+                                       scrolling_distance, XA_INTEGER, act_format,
+                                       PropModeReplace, data, nitems);
+        }
+
+        if (gdk_error_trap_pop ())
+                g_warning ("Error setting %s for \"%s\"",
+                           natural_scroll ? "natural (reverse) scroll" : "normal scroll",
+                           gdk_device_get_name (device));
+
+        if (rc == Success)
+                XFree (data);
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+}
+
+static void
+mouse_callback (GSettings       *settings,
+                const gchar     *key,
+                GsdMouseManager *manager)
+{
+        GList *devices, *l;
+
+        if (g_str_equal (key, KEY_DWELL_CLICK_ENABLED) ||
+            g_str_equal (key, KEY_SECONDARY_CLICK_ENABLED)) {
+                set_mousetweaks_daemon (manager,
+                                        g_settings_get_boolean (settings, KEY_DWELL_CLICK_ENABLED),
+                                        g_settings_get_boolean (settings, KEY_SECONDARY_CLICK_ENABLED));
+                return;
+        } else if (g_str_equal (key, KEY_LOCATE_POINTER)) {
+                set_locate_pointer (manager, g_settings_get_boolean (settings, KEY_LOCATE_POINTER));
+                return;
+        }
+
+        devices = gdk_device_manager_list_devices (manager->priv->device_manager, GDK_DEVICE_TYPE_SLAVE);
+
+        for (l = devices; l != NULL; l = l->next) {
+                GdkDevice *device = l->data;
+
+                if (device_is_ignored (manager, device))
+                        continue;
+
+                if (g_str_equal (key, KEY_LEFT_HANDED)) {
+                        gboolean mouse_left_handed;
+                        mouse_left_handed = g_settings_get_boolean (settings, KEY_LEFT_HANDED);
+                        set_left_handed (manager, device, mouse_left_handed, get_touchpad_handedness (manager, mouse_left_handed));
+                } else if (g_str_equal (key, KEY_MOTION_ACCELERATION) ||
+                           g_str_equal (key, KEY_MOTION_THRESHOLD)) {
+                        set_motion (manager, device);
+                } else if (g_str_equal (key, KEY_MIDDLE_BUTTON_EMULATION)) {
+                        set_middle_button (manager, device, g_settings_get_boolean (settings, KEY_MIDDLE_BUTTON_EMULATION));
+                }
+        }
+        g_list_free (devices);
+}
+
+static void
+touchpad_callback (GSettings       *settings,
+                   const gchar     *key,
+                   GsdMouseManager *manager)
+{
+        GList *devices, *l;
+
+        if (g_str_equal (key, KEY_TOUCHPAD_DISABLE_W_TYPING)) {
+                set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, key));
+                return;
+        }
+
+        devices = gdk_device_manager_list_devices (manager->priv->device_manager, GDK_DEVICE_TYPE_SLAVE);
+
+        for (l = devices; l != NULL; l = l->next) {
+                GdkDevice *device = l->data;
+
+                if (device_is_ignored (manager, device))
+                        continue;
+
+                if (g_str_equal (key, KEY_TAP_TO_CLICK)) {
+                        set_tap_to_click (device, g_settings_get_boolean (settings, key),
+                                          g_settings_get_boolean (manager->priv->touchpad_settings, KEY_LEFT_HANDED));
+                } else if (g_str_equal (key, KEY_SCROLL_METHOD)) {
+                        set_edge_scroll (device, g_settings_get_enum (settings, key));
+                        set_horiz_scroll (device, g_settings_get_boolean (settings, KEY_PAD_HORIZ_SCROLL));
+                } else if (g_str_equal (key, KEY_PAD_HORIZ_SCROLL)) {
+                        set_horiz_scroll (device, g_settings_get_boolean (settings, key));
+                } else if (g_str_equal (key, KEY_TOUCHPAD_ENABLED)) {
+                        if (g_settings_get_boolean (settings, key) == FALSE)
+                                set_touchpad_disabled (device);
+                        else
+                                set_touchpad_enabled (gdk_x11_device_get_id (device));
+                } else if (g_str_equal (key, KEY_MOTION_ACCELERATION) ||
+                           g_str_equal (key, KEY_MOTION_THRESHOLD)) {
+                        set_motion (manager, device);
+                } else if (g_str_equal (key, KEY_LEFT_HANDED)) {
+                        gboolean mouse_left_handed;
+                        mouse_left_handed = g_settings_get_boolean (manager->priv->mouse_settings, KEY_LEFT_HANDED);
+                        set_left_handed (manager, device, mouse_left_handed, get_touchpad_handedness (manager, mouse_left_handed));
+                } else if (g_str_equal (key, KEY_NATURAL_SCROLL_ENABLED)) {
+                        set_natural_scroll (manager, device, g_settings_get_boolean (settings, key));
+                }
+        }
+        g_list_free (devices);
+
+        if (g_str_equal (key, KEY_TOUCHPAD_ENABLED) &&
+            g_settings_get_boolean (settings, key)) {
+                devices = get_disabled_devices (manager->priv->device_manager);
+                for (l = devices; l != NULL; l = l->next) {
+                        int device_id;
+
+                        device_id = GPOINTER_TO_INT (l->data);
+                        set_touchpad_enabled (device_id);
+                }
+                g_list_free (devices);
+        }
+}
+
+static void
+device_added_cb (GdkDeviceManager *device_manager,
+                 GdkDevice        *device,
+                 GsdMouseManager  *manager)
+{
+        if (device_is_ignored (manager, device) == FALSE) {
+                if (run_custom_command (device, COMMAND_DEVICE_ADDED) == FALSE) {
+                        set_mouse_settings (manager, device);
+                } else {
+                        int id;
+                        g_object_get (G_OBJECT (device), "device-id", &id, NULL);
+                        g_hash_table_insert (manager->priv->blacklist,
+                                             GINT_TO_POINTER (id), GINT_TO_POINTER (1));
+                }
+
+                /* If a touchpad was to appear... */
+                set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_DISABLE_W_TYPING));
+        }
+}
+
+static void
+device_removed_cb (GdkDeviceManager *device_manager,
+                   GdkDevice        *device,
+                   GsdMouseManager  *manager)
+{
+	int id;
+
+	/* Remove the device from the hash table so that
+	 * device_is_ignored () doesn't check for blacklisted devices */
+	g_object_get (G_OBJECT (device), "device-id", &id, NULL);
+	g_hash_table_remove (manager->priv->blacklist,
+			     GINT_TO_POINTER (id));
+
+        if (device_is_ignored (manager, device) == FALSE) {
+                run_custom_command (device, COMMAND_DEVICE_REMOVED);
+
+                /* If a touchpad was to disappear... */
+                set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_DISABLE_W_TYPING));
+        }
+}
+
+static void
+set_devicepresence_handler (GsdMouseManager *manager)
+{
+        GdkDeviceManager *device_manager;
+
+        device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
+
+        manager->priv->device_added_id = g_signal_connect (G_OBJECT (device_manager), "device-added",
+                                                           G_CALLBACK (device_added_cb), manager);
+        manager->priv->device_removed_id = g_signal_connect (G_OBJECT (device_manager), "device-removed",
+                                                             G_CALLBACK (device_removed_cb), manager);
+        manager->priv->device_manager = device_manager;
+}
+
+static void
+gsd_mouse_manager_init (GsdMouseManager *manager)
+{
+        manager->priv = GSD_MOUSE_MANAGER_GET_PRIVATE (manager);
+        manager->priv->blacklist = g_hash_table_new (g_direct_hash, g_direct_equal);
+}
+
+static gboolean
+gsd_mouse_manager_idle_cb (GsdMouseManager *manager)
+{
+        GList *devices, *l;
+
+        gnome_settings_profile_start (NULL);
+
+        set_devicepresence_handler (manager);
+
+        manager->priv->mouse_settings = g_settings_new (SETTINGS_MOUSE_DIR);
+        g_signal_connect (manager->priv->mouse_settings, "changed",
+                          G_CALLBACK (mouse_callback), manager);
+
+        manager->priv->mouse_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
+        g_signal_connect (manager->priv->mouse_a11y_settings, "changed",
+                          G_CALLBACK (mouse_callback), manager);
+
+        manager->priv->touchpad_settings = g_settings_new (SETTINGS_TOUCHPAD_DIR);
+        g_signal_connect (manager->priv->touchpad_settings, "changed",
+                          G_CALLBACK (touchpad_callback), manager);
+
+        manager->priv->syndaemon_spawned = FALSE;
+
+        set_locate_pointer (manager, g_settings_get_boolean (manager->priv->mouse_settings, KEY_LOCATE_POINTER));
+        set_mousetweaks_daemon (manager,
+                                g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_DWELL_CLICK_ENABLED),
+                                g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_SECONDARY_CLICK_ENABLED));
+        set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_DISABLE_W_TYPING));
+
+        devices = gdk_device_manager_list_devices (manager->priv->device_manager, GDK_DEVICE_TYPE_SLAVE);
+        for (l = devices; l != NULL; l = l->next) {
+                GdkDevice *device = l->data;
+
+                if (device_is_ignored (manager, device))
+                        continue;
+
+                if (run_custom_command (device, COMMAND_DEVICE_PRESENT) == FALSE) {
+                        set_mouse_settings (manager, device);
+                } else {
+                        int id;
+                        g_object_get (G_OBJECT (device), "device-id", &id, NULL);
+                        g_hash_table_insert (manager->priv->blacklist,
+                                             GINT_TO_POINTER (id), GINT_TO_POINTER (1));
+                }
+        }
+        g_list_free (devices);
+
+        if (g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_ENABLED)) {
+                devices = get_disabled_devices (manager->priv->device_manager);
+                for (l = devices; l != NULL; l = l->next) {
+                        int device_id;
+
+                        device_id = GPOINTER_TO_INT (l->data);
+                        set_touchpad_enabled (device_id);
+                }
+                g_list_free (devices);
+        }
+
+        gnome_settings_profile_end (NULL);
+
+        manager->priv->start_idle_id = 0;
+
+        return FALSE;
+}
+
+gboolean
+gsd_mouse_manager_start (GsdMouseManager *manager,
+                         GError         **error)
+{
+        gnome_settings_profile_start (NULL);
+
+        if (!supports_xinput_devices ()) {
+                g_debug ("XInput is not supported, not applying any settings");
+                return TRUE;
+        }
+
+        manager->priv->start_idle_id = g_idle_add ((GSourceFunc) gsd_mouse_manager_idle_cb, manager);
+
+        gnome_settings_profile_end (NULL);
+
+        return TRUE;
+}
+
+void
+gsd_mouse_manager_stop (GsdMouseManager *manager)
+{
+        GsdMouseManagerPrivate *p = manager->priv;
+
+        g_debug ("Stopping mouse manager");
+
+        if (p->device_manager != NULL) {
+                g_signal_handler_disconnect (p->device_manager, p->device_added_id);
+                g_signal_handler_disconnect (p->device_manager, p->device_removed_id);
+                p->device_manager = NULL;
+        }
+
+        if (p->mouse_a11y_settings != NULL) {
+                g_object_unref (p->mouse_a11y_settings);
+                p->mouse_a11y_settings = NULL;
+        }
+
+        if (p->mouse_settings != NULL) {
+                g_object_unref (p->mouse_settings);
+                p->mouse_settings = NULL;
+        }
+
+        if (p->touchpad_settings != NULL) {
+                g_object_unref (p->touchpad_settings);
+                p->touchpad_settings = NULL;
+        }
+
+        set_locate_pointer (manager, FALSE);
+}
+
+static void
+gsd_mouse_manager_finalize (GObject *object)
+{
+        GsdMouseManager *mouse_manager;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GSD_IS_MOUSE_MANAGER (object));
+
+        mouse_manager = GSD_MOUSE_MANAGER (object);
+
+        g_return_if_fail (mouse_manager->priv != NULL);
+
+        if (mouse_manager->priv->blacklist != NULL)
+                g_hash_table_destroy (mouse_manager->priv->blacklist);
+
+        if (mouse_manager->priv->start_idle_id != 0)
+                g_source_remove (mouse_manager->priv->start_idle_id);
+
+        if (mouse_manager->priv->device_manager != NULL) {
+                g_signal_handler_disconnect (mouse_manager->priv->device_manager, mouse_manager->priv->device_added_id);
+                g_signal_handler_disconnect (mouse_manager->priv->device_manager, mouse_manager->priv->device_removed_id);
+        }
+
+        if (mouse_manager->priv->mouse_settings != NULL)
+                g_object_unref (mouse_manager->priv->mouse_settings);
+
+        if (mouse_manager->priv->mouse_a11y_settings != NULL)
+                g_object_unref (mouse_manager->priv->mouse_a11y_settings);
+
+        if (mouse_manager->priv->touchpad_settings != NULL)
+                g_object_unref (mouse_manager->priv->touchpad_settings);
+
+        G_OBJECT_CLASS (gsd_mouse_manager_parent_class)->finalize (object);
+}
+
+GsdMouseManager *
+gsd_mouse_manager_new (void)
+{
+        if (manager_object != NULL) {
+                g_object_ref (manager_object);
+        } else {
+                manager_object = g_object_new (GSD_TYPE_MOUSE_MANAGER, NULL);
+                g_object_add_weak_pointer (manager_object,
+                                           (gpointer *) &manager_object);
+        }
+
+        return GSD_MOUSE_MANAGER (manager_object);
+}

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-29 11:14:56 +0000
+++ debian/changelog	2013-08-29 18:58:42 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.6.4-0ubuntu20) saucy; urgency=low
+
+  * "Disable while typing" should disable cursor movements (LP: #1215463),
+    debian/patches/tune-syndaemon.patch: Launch syndaemon with '-i 0.5 -K -R'
+
+ -- Jason Gerard DeRose <[e-mail]>  Thu, 29 Aug 2013 12:56:37 -0600
+
 gnome-settings-daemon (3.6.4-0ubuntu19) saucy; urgency=low
 
   * Install the ibus dbus service (LP: #1194138)

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-08-29 16:10:41 +0000
+++ debian/patches/series	2013-08-29 18:58:42 +0000
@@ -31,3 +31,4 @@
 git_keyboard_Adapt_to_gnome_xkb_info_API_change.patch
 git_keyboard_Adapt_to_gnome_xkb_info_API_change_2.patch
 git_keybindings_add_screen_reader_toggle.patch
+tune-syndaemon.patch

=== added file 'debian/patches/tune-syndaemon.patch'
--- debian/patches/tune-syndaemon.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/tune-syndaemon.patch	2013-08-29 18:58:42 +0000
@@ -0,0 +1,20 @@
+Description: Tweaks syndaemon arguments so it disables cursor movement when typing
+Author: Jason Gerard DeRose <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1215463
+Forwarded: no
+Last-Update: 2013-08-26
+
+---
+
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -583,8 +583,7 @@
+ 
+                 g_ptr_array_add (args, "syndaemon");
+                 g_ptr_array_add (args, "-i");
+-                g_ptr_array_add (args, "1.0");
+-                g_ptr_array_add (args, "-t");
++                g_ptr_array_add (args, "0.5");
+                 g_ptr_array_add (args, "-K");
+                 g_ptr_array_add (args, "-R");
+                 g_ptr_array_add (args, NULL);

=== modified file 'plugins/mouse/gsd-mouse-manager.c'
--- plugins/mouse/gsd-mouse-manager.c	2012-11-21 17:16:23 +0000
+++ plugins/mouse/gsd-mouse-manager.c	2013-08-29 18:58:42 +0000
@@ -583,8 +583,7 @@
 
                 g_ptr_array_add (args, "syndaemon");
                 g_ptr_array_add (args, "-i");
-                g_ptr_array_add (args, "1.0");
-                g_ptr_array_add (args, "-t");
+                g_ptr_array_add (args, "0.5");
                 g_ptr_array_add (args, "-K");
                 g_ptr_array_add (args, "-R");
                 g_ptr_array_add (args, NULL);