Merge lp:~brandontschaefer/gnome-settings-daemon/unity-super-l-lock-screen-patch into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Brandon Schaefer]

Change the shortcut to lock the screen from Ctrl+Alt+L to Super+L

Change the shortcut to lock the screen from Ctrl+Alt+L to Super+L

[Brandon Schaefer (brandontschaefer)]

This was a bad solution to the bug linked, as it replaces the old shortcut.

DO NO MERGE THIS BRANCH. (Rejected, but I don't seem to have the power to reject it)

The real fix:
https://code.launchpad.net/~brandontschaefer/unity/super-l-lock-screen/+merge/200576

Unmerged revisions

450. By Brandon Schaefer on 2014-01-06

* Add in patch to change lock screen shortcut from Ctrl+Alt+L to Super+L
https://bugs.launchpad.net/unity/+bug/830709

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-11-12 19:32:12 +0000
+++ debian/patches/series	2014-01-06 18:40:59 +0000
@@ -26,5 +26,6 @@
 ubuntu-lid-close-suspend.patch
 git_touchpad_scrolling.patch
 unity-modifier-media-keys.patch
+unity-super-l-lock-screen.patch
 ubuntu-lid-open-reset-ideletime.patch
 git_xsettings_segfaults.patch

=== added file 'debian/patches/unity-super-l-lock-screen.patch'
--- debian/patches/unity-super-l-lock-screen.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/unity-super-l-lock-screen.patch	2014-01-06 18:40:59 +0000
@@ -0,0 +1,12 @@
+--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+@@ -71,7 +71,7 @@
+       <_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>
++      <default>'&lt;Super&gt;l'</default>
+       <_summary>Lock screen</_summary>
+       <_description>Binding to lock the screen.</_description>
+     </key>
+