Compiz

Merge lp:~3v1n0/compiz/unity-wm-shortcuts-0.9.10 into lp:compiz/0.9.10

  1. unity-wm-shortcuts-0.9.10
  2. Merge into 0.9.10
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3789
Merged at revision: 3789
Proposed branch: lp:~3v1n0/compiz/unity-wm-shortcuts-0.9.10
Merge into: lp:compiz/0.9.10
Diff against target: 249 lines (+69/-60)
1 file modified
debian/patches/ubuntu-config.patch (+69/-60)
To merge this branch: bzr merge lp:~3v1n0/compiz/unity-wm-shortcuts-0.9.10
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+185823@code.launchpad.net

Commit message

debian/patches/ubuntu-config.patch: remove grid custom keybindings for window management

We handle these directly in unity

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3789
http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-team-compiz-0.9.10-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3789
http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-0.9.10-ci/2/rebuild

review: Approve (continuous-integration)
lp:~3v1n0/compiz/unity-wm-shortcuts-0.9.10 updated
3789. By Marco Trevisan (Treviño)

debian/patches/ubuntu-config.patch: remove grid custom keybindings for window management

We handle these directly in unity

Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch 2013-09-09 14:08:50 +0000
+++ debian/patches/ubuntu-config.patch 2013-09-16 16:03:41 +0000
@@ -1,6 +1,8 @@
1=== modified file 'metadata/core.xml.in'1=== modified file 'metadata/core.xml.in'
2--- a/metadata/core.xml.in2Index: compiz/metadata/core.xml.in
3+++ b/metadata/core.xml.in3===================================================================
4--- compiz.orig/metadata/core.xml.in 2013-09-16 18:01:32.553411336 +0200
5+++ compiz/metadata/core.xml.in 2013-09-16 18:01:32.537411397 +0200
4@@ -139,7 +139,7 @@6@@ -139,7 +139,7 @@
5 <option name="focus_prevention_match" type="match">7 <option name="focus_prevention_match" type="match">
6 <_short>Focus Prevention Windows</_short>8 <_short>Focus Prevention Windows</_short>
@@ -63,8 +65,10 @@
63 <min>1</min>65 <min>1</min>
64 <max>32</max>66 <max>32</max>
65 </option>67 </option>
66--- a/plugins/animation/animation.xml.in68Index: compiz/plugins/animation/animation.xml.in
67+++ b/plugins/animation/animation.xml.in69===================================================================
70--- compiz.orig/plugins/animation/animation.xml.in 2013-09-16 18:01:32.553411336 +0200
71+++ compiz/plugins/animation/animation.xml.in 2013-09-16 18:01:32.537411397 +0200
68@@ -36,7 +36,7 @@72@@ -36,7 +36,7 @@
69 <extensible/>73 <extensible/>
70 <sort start="2"/>74 <sort start="2"/>
@@ -203,8 +207,10 @@
203 <min>0</min>207 <min>0</min>
204 <max>1</max>208 <max>1</max>
205 <precision>0.01</precision>209 <precision>0.01</precision>
206--- a/plugins/decor/decor.xml.in210Index: compiz/plugins/decor/decor.xml.in
207+++ b/plugins/decor/decor.xml.in211===================================================================
212--- compiz.orig/plugins/decor/decor.xml.in 2013-09-16 18:01:32.553411336 +0200
213+++ compiz/plugins/decor/decor.xml.in 2013-09-16 18:01:32.537411397 +0200
208@@ -31,7 +31,7 @@214@@ -31,7 +31,7 @@
209 <option name="active_shadow_opacity" type="float">215 <option name="active_shadow_opacity" type="float">
210 <_short>Shadow Opacity</_short>216 <_short>Shadow Opacity</_short>
@@ -241,8 +247,10 @@
241 </option>247 </option>
242 <option name="mipmap" type="bool">248 <option name="mipmap" type="bool">
243 <_short>Mipmap</_short>249 <_short>Mipmap</_short>
244--- a/plugins/fade/fade.xml.in250Index: compiz/plugins/fade/fade.xml.in
245+++ b/plugins/fade/fade.xml.in251===================================================================
252--- compiz.orig/plugins/fade/fade.xml.in 2013-09-16 18:01:32.553411336 +0200
253+++ compiz/plugins/fade/fade.xml.in 2013-09-16 18:01:32.541411382 +0200
246@@ -10,6 +10,7 @@254@@ -10,6 +10,7 @@
247 </requirement>255 </requirement>
248 <relation type="after">256 <relation type="after">
@@ -260,8 +268,10 @@
260 </option>268 </option>
261 <option name="visual_bell" type="bell">269 <option name="visual_bell" type="bell">
262 <_short>Visual Bell</_short>270 <_short>Visual Bell</_short>
263--- a/plugins/gnomecompat/gnomecompat.xml.in271Index: compiz/plugins/gnomecompat/gnomecompat.xml.in
264+++ b/plugins/gnomecompat/gnomecompat.xml.in272===================================================================
273--- compiz.orig/plugins/gnomecompat/gnomecompat.xml.in 2013-09-16 18:01:32.553411336 +0200
274+++ compiz/plugins/gnomecompat/gnomecompat.xml.in 2013-09-16 18:01:32.541411382 +0200
265@@ -53,6 +53,7 @@275@@ -53,6 +53,7 @@
266 <option name="run_command_terminal_key" type="key">276 <option name="run_command_terminal_key" type="key">
267 <_short>Open a terminal</_short>277 <_short>Open a terminal</_short>
@@ -270,8 +280,10 @@
270 </option>280 </option>
271 </group>281 </group>
272 </options>282 </options>
273--- a/plugins/place/place.xml.in283Index: compiz/plugins/place/place.xml.in
274+++ b/plugins/place/place.xml.in284===================================================================
285--- compiz.orig/plugins/place/place.xml.in 2013-09-16 18:01:32.553411336 +0200
286+++ compiz/plugins/place/place.xml.in 2013-09-16 18:01:32.541411382 +0200
275@@ -20,8 +20,8 @@287@@ -20,8 +20,8 @@
276 <option name="mode" type="int">288 <option name="mode" type="int">
277 <_short>Placement Mode</_short>289 <_short>Placement Mode</_short>
@@ -283,8 +295,10 @@
283 <max>5</max>295 <max>5</max>
284 <desc>296 <desc>
285 <value>0</value>297 <value>0</value>
286--- a/plugins/resize/resize.xml.in298Index: compiz/plugins/resize/resize.xml.in
287+++ b/plugins/resize/resize.xml.in299===================================================================
300--- compiz.orig/plugins/resize/resize.xml.in 2013-09-16 18:01:32.553411336 +0200
301+++ compiz/plugins/resize/resize.xml.in 2013-09-16 18:01:32.541411382 +0200
288@@ -28,7 +28,7 @@302@@ -28,7 +28,7 @@
289 <option name="mode" type="int">303 <option name="mode" type="int">
290 <_short>Default Resize Mode</_short>304 <_short>Default Resize Mode</_short>
@@ -329,8 +343,10 @@
329 </default>343 </default>
330 </option>344 </option>
331 <subgroup>345 <subgroup>
332--- a/plugins/scale/scale.xml.in346Index: compiz/plugins/scale/scale.xml.in
333+++ b/plugins/scale/scale.xml.in347===================================================================
348--- compiz.orig/plugins/scale/scale.xml.in 2013-09-16 18:01:32.553411336 +0200
349+++ compiz/plugins/scale/scale.xml.in 2013-09-16 18:01:32.541411382 +0200
334@@ -19,14 +19,14 @@350@@ -19,14 +19,14 @@
335 <option name="spacing" type="int">351 <option name="spacing" type="int">
336 <_short>Spacing</_short>352 <_short>Spacing</_short>
@@ -419,8 +435,10 @@
419 </option>435 </option>
420 </group>436 </group>
421 </options>437 </options>
422--- a/plugins/staticswitcher/staticswitcher.xml.in438Index: compiz/plugins/staticswitcher/staticswitcher.xml.in
423+++ b/plugins/staticswitcher/staticswitcher.xml.in439===================================================================
440--- compiz.orig/plugins/staticswitcher/staticswitcher.xml.in 2013-09-16 18:01:32.553411336 +0200
441+++ compiz/plugins/staticswitcher/staticswitcher.xml.in 2013-09-16 18:01:32.541411382 +0200
424@@ -11,7 +11,6 @@442@@ -11,7 +11,6 @@
425 <relation type="after">443 <relation type="after">
426 <plugin>composite</plugin>444 <plugin>composite</plugin>
@@ -497,8 +515,10 @@
497 <desc>515 <desc>
498 <value>0</value>516 <value>0</value>
499 <_name>None</_name>517 <_name>None</_name>
500--- a/plugins/vpswitch/vpswitch.xml.in518Index: compiz/plugins/vpswitch/vpswitch.xml.in
501+++ b/plugins/vpswitch/vpswitch.xml.in519===================================================================
520--- compiz.orig/plugins/vpswitch/vpswitch.xml.in 2013-09-16 18:01:32.553411336 +0200
521+++ compiz/plugins/vpswitch/vpswitch.xml.in 2013-09-16 18:01:32.541411382 +0200
502@@ -95,13 +95,11 @@522@@ -95,13 +95,11 @@
503 <option name="next_button" type="button">523 <option name="next_button" type="button">
504 <_short>Move Next</_short>524 <_short>Move Next</_short>
@@ -513,8 +533,10 @@
513 <internal/>533 <internal/>
514 </option>534 </option>
515 <option name="initiate_button" type="button">535 <option name="initiate_button" type="button">
516--- a/plugins/wall/wall.xml.in536Index: compiz/plugins/wall/wall.xml.in
517+++ b/plugins/wall/wall.xml.in537===================================================================
538--- compiz.orig/plugins/wall/wall.xml.in 2013-09-16 18:01:32.553411336 +0200
539+++ compiz/plugins/wall/wall.xml.in 2013-09-16 18:01:32.541411382 +0200
518@@ -30,12 +30,12 @@540@@ -30,12 +30,12 @@
519 <option name="miniscreen" type="bool">541 <option name="miniscreen" type="bool">
520 <_short>Show Live Viewport Previews</_short>542 <_short>Show Live Viewport Previews</_short>
@@ -671,8 +693,10 @@
671 </option>693 </option>
672 <option name="edgeflip_dnd" type="bool">694 <option name="edgeflip_dnd" type="bool">
673 <_short>Edge Flip DnD</_short>695 <_short>Edge Flip DnD</_short>
674--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp696Index: compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
675+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp697===================================================================
698--- compiz.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-09-16 18:01:32.553411336 +0200
699+++ compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-09-16 18:01:32.541411382 +0200
676@@ -46,7 +46,7 @@700@@ -46,7 +46,7 @@
677 701
678 namespace702 namespace
@@ -682,34 +706,11 @@
682 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;706 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
683 707
684 bool Advance (Display *d, bool r)708 bool Advance (Display *d, bool r)
685--- a/plugins/grid/grid.xml.in709Index: compiz/plugins/grid/grid.xml.in
686+++ b/plugins/grid/grid.xml.in710===================================================================
687@@ -23,17 +23,16 @@711--- compiz.orig/plugins/grid/grid.xml.in 2013-09-16 18:01:32.553411336 +0200
688 <option name="put_center_key" type="key">712+++ compiz/plugins/grid/grid.xml.in 2013-09-16 18:01:49.693346061 +0200
689 <_short>Put Center Key</_short>713@@ -73,7 +73,7 @@
690 <_long>Move window to the center.</_long>
691- <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
692 </option>
693 <option name="put_left_key" type="key">
694 <_short>Put Left Key</_short>
695 <_long>Move window to the left edge.</_long>
696- <default>&lt;Control&gt;&lt;Alt&gt;KP_4</default>
697+ <default>&lt;Control&gt;&lt;Super&gt;Left</default>
698 </option>
699 <option name="put_right_key" type="key">
700 <_short>Put Right Key</_short>
701 <_long>Move window to the right edge.</_long>
702- <default>&lt;Control&gt;&lt;Alt&gt;KP_6</default>
703+ <default>&lt;Control&gt;&lt;Super&gt;Right</default>
704 </option>
705 <option name="put_top_key" type="key">
706 <_short>Put Top Key</_short>
707@@ -68,12 +67,11 @@
708 <option name="put_maximize_key" type="key">
709 <_short>Maximize Key</_short>
710 <_long>Maximize window.</_long>
711- <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
712 </option>
713 <option name="put_restore_key" type="key">714 <option name="put_restore_key" type="key">
714 <_short>Restore</_short>715 <_short>Restore</_short>
715 <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long>716 <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long>
@@ -718,8 +719,10 @@
718 </option>719 </option>
719 </group>720 </group>
720 <group>721 <group>
721--- a/plugins/ezoom/ezoom.xml.in722Index: compiz/plugins/ezoom/ezoom.xml.in
722+++ b/plugins/ezoom/ezoom.xml.in723===================================================================
724--- compiz.orig/plugins/ezoom/ezoom.xml.in 2013-09-16 18:01:32.553411336 +0200
725+++ compiz/plugins/ezoom/ezoom.xml.in 2013-09-16 18:01:32.545411366 +0200
723@@ -30,7 +30,7 @@726@@ -30,7 +30,7 @@
724 <option type="button" name="zoom_in_button">727 <option type="button" name="zoom_in_button">
725 <_short>Zoom In Button</_short>728 <_short>Zoom In Button</_short>
@@ -756,8 +759,10 @@
756 </option>759 </option>
757 </subgroup>760 </subgroup>
758 </group>761 </group>
759--- a/plugins/expo/expo.xml.in762Index: compiz/plugins/expo/expo.xml.in
760+++ b/plugins/expo/expo.xml.in763===================================================================
764--- compiz.orig/plugins/expo/expo.xml.in 2013-09-16 18:01:32.553411336 +0200
765+++ compiz/plugins/expo/expo.xml.in 2013-09-16 18:01:32.545411366 +0200
761@@ -17,6 +17,7 @@766@@ -17,6 +17,7 @@
762 <plugin>wobbly</plugin>767 <plugin>wobbly</plugin>
763 <plugin>animation</plugin>768 <plugin>animation</plugin>
@@ -852,8 +857,10 @@
852 </option>857 </option>
853 <option name="ground_color1" type="color">858 <option name="ground_color1" type="color">
854 <_short>Ground Color (near)</_short>859 <_short>Ground Color (near)</_short>
855--- a/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml860Index: compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
856+++ b/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml861===================================================================
862--- compiz.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-09-16 18:01:32.553411336 +0200
863+++ compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-09-16 18:01:32.545411366 +0200
857@@ -10,6 +10,9 @@864@@ -10,6 +10,9 @@
858 <key type="s" name="command-screenshot">865 <key type="s" name="command-screenshot">
859 <default>"gnome-screenshot"</default>866 <default>"gnome-screenshot"</default>
@@ -874,8 +881,10 @@
874 <key type="s" name="command-12">881 <key type="s" name="command-12">
875 <default>""</default>882 <default>""</default>
876 </key>883 </key>
877--- a/plugins/commands/commands.xml.in884Index: compiz/plugins/commands/commands.xml.in
878+++ b/plugins/commands/commands.xml.in885===================================================================
886--- compiz.orig/plugins/commands/commands.xml.in 2013-09-16 18:01:32.553411336 +0200
887+++ compiz/plugins/commands/commands.xml.in 2013-09-16 18:01:32.545411366 +0200
879@@ -117,7 +117,7 @@888@@ -117,7 +117,7 @@
880 <option name="command20" type="string">889 <option name="command20" type="string">
881 <_short>Command line 20</_short>890 <_short>Command line 20</_short>

Subscribers

People subscribed via source and target branches