Gala

Merge lp:~shnatsel/gala/fix-1110216 into lp:gala

  1. fix-1110216
  2. Merge into trunk
Proposed by Sergey "Shnatsel" Davidoff
Status: Merged
Approved by: Rico Tzschichholz
Approved revision: 282
Merged at revision: 283
Proposed branch: lp:~shnatsel/gala/fix-1110216
Merge into: lp:gala
Diff against target: 35 lines (+4/-4)
2 files modified
data/org.pantheon.desktop.gala.gschema.xml (+2/-2)
src/Plugin.vala (+2/-2)
To merge this branch: bzr merge lp:~shnatsel/gala/fix-1110216
Reviewer Review Type Date Requested Status
Rico Tzschichholz Approve
Review via email: mp+145566@code.launchpad.net

Description of the change

Rename "move-to-workspace-*" keys in Gala's GSettings to "switch-to-workspace-*" to match the key names of org.gnome.desktop.wm schema which Gala also reads: in that schema "move-to-workspace-*" means moving the active window, not switching the viewport. (bug 1110216)

This also lays the groundwork for bug 1110218

To post a comment you must log in.
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Tested cleanly with my new testing scripts; it really works, not like the last few GSettings merges.

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Needs parallel fixing of switchboard-plug-keyboard

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Parallel fixing of switchboard-plug-keyboard: https://code.launchpad.net/~shnatsel/switchboard-plug-keyboard/update-gala-workspace-keys-bug-1110216/+merge/145593

Revision history for this message
Rico Tzschichholz (ricotz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/org.pantheon.desktop.gala.gschema.xml'
2--- data/org.pantheon.desktop.gala.gschema.xml 2013-01-23 15:54:26 +0000
3+++ data/org.pantheon.desktop.gala.gschema.xml 2013-01-30 10:02:22 +0000
4@@ -66,12 +66,12 @@
5 <summary></summary>
6 <description></description>
7 </key>
8- <key type="as" name="move-to-workspace-first">
9+ <key type="as" name="switch-to-workspace-first">
10 <default><![CDATA[['<Super>Home']]]></default>
11 <summary>Shortcut to move to first workspace</summary>
12 <description></description>
13 </key>
14- <key type="as" name="move-to-workspace-last">
15+ <key type="as" name="switch-to-workspace-last">
16 <default><![CDATA[['<Super>End', '<Super>0']]]></default>
17 <summary>Shortcut to move to last workspace</summary>
18 <description></description>
19
20=== modified file 'src/Plugin.vala'
21--- src/Plugin.vala 2013-01-23 15:54:26 +0000
22+++ src/Plugin.vala 2013-01-30 10:02:22 +0000
23@@ -99,10 +99,10 @@
24 screen.get_display ().add_keybinding ("expose-all-windows", BehaviorSettings.get_default ().schema, 0, () => {
25 window_overview.open (true, true);
26 });
27- screen.get_display ().add_keybinding ("move-to-workspace-first", BehaviorSettings.get_default ().schema, 0, () => {
28+ screen.get_display ().add_keybinding ("switch-to-workspace-first", BehaviorSettings.get_default ().schema, 0, () => {
29 screen.get_workspace_by_index (0).activate (screen.get_display ().get_current_time ());
30 });
31- screen.get_display ().add_keybinding ("move-to-workspace-last", BehaviorSettings.get_default ().schema, 0, () => {
32+ screen.get_display ().add_keybinding ("switch-to-workspace-last", BehaviorSettings.get_default ().schema, 0, () => {
33 screen.get_workspace_by_index (screen.n_workspaces - 1).activate (screen.get_display ().get_current_time ());
34 });
35 screen.get_display ().add_keybinding ("zoom-in", BehaviorSettings.get_default ().schema, 0, () => {

Subscribers

People subscribed via source and target branches