Compiz

Merge lp:~3v1n0/compiz/ctrl+alt+kp0-clash-fix-0.9.10 into lp:compiz/0.9.10

  1. ctrl+alt+kp0-clash-fix-0.9.10
  2. Merge into 0.9.10
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3797
Merged at revision: 3797
Proposed branch: lp:~3v1n0/compiz/ctrl+alt+kp0-clash-fix-0.9.10
Merge into: lp:compiz/0.9.10
Diff against target: 246 lines (+57/-52)
1 file modified
debian/patches/ubuntu-config.patch (+57/-52)
To merge this branch: bzr merge lp:~3v1n0/compiz/ctrl+alt+kp0-clash-fix-0.9.10
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend (community) Approve
Review via email: mp+189881@code.launchpad.net

Commit message

debian/patches/ubuntu-config.patch: Don't use Ctrl+Alt+KP_0 for grid maximize

Otherwise this clashes with default minimize key.

Description of the change

debian/patches/ubuntu-config.patch: Don't use Ctrl+Alt+KP_0 for grid maximize

Otherwise this clashes with default minimize key.

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

+1

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

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-16 16:03:03 +0000
+++ debian/patches/ubuntu-config.patch 2013-10-08 15:04:32 +0000
@@ -1,8 +1,8 @@
1=== modified file 'metadata/core.xml.in'1=== modified file 'metadata/core.xml.in'
2Index: compiz/metadata/core.xml.in2Index: compiz-0.9.10/metadata/core.xml.in
3===================================================================3===================================================================
4--- compiz.orig/metadata/core.xml.in 2013-09-16 18:01:32.553411336 +02004--- compiz-0.9.10.orig/metadata/core.xml.in 2013-10-08 17:02:17.016547820 +0200
5+++ compiz/metadata/core.xml.in 2013-09-16 18:01:32.537411397 +02005+++ compiz-0.9.10/metadata/core.xml.in 2013-10-08 17:02:17.004547851 +0200
6@@ -139,7 +139,7 @@6@@ -139,7 +139,7 @@
7 <option name="focus_prevention_match" type="match">7 <option name="focus_prevention_match" type="match">
8 <_short>Focus Prevention Windows</_short>8 <_short>Focus Prevention Windows</_short>
@@ -65,10 +65,10 @@
65 <min>1</min>65 <min>1</min>
66 <max>32</max>66 <max>32</max>
67 </option>67 </option>
68Index: compiz/plugins/animation/animation.xml.in68Index: compiz-0.9.10/plugins/animation/animation.xml.in
69===================================================================69===================================================================
70--- compiz.orig/plugins/animation/animation.xml.in 2013-09-16 18:01:32.553411336 +020070--- compiz-0.9.10.orig/plugins/animation/animation.xml.in 2013-10-08 17:02:17.016547820 +0200
71+++ compiz/plugins/animation/animation.xml.in 2013-09-16 18:01:32.537411397 +020071+++ compiz-0.9.10/plugins/animation/animation.xml.in 2013-10-08 17:02:17.004547851 +0200
72@@ -36,7 +36,7 @@72@@ -36,7 +36,7 @@
73 <extensible/>73 <extensible/>
74 <sort start="2"/>74 <sort start="2"/>
@@ -207,10 +207,10 @@
207 <min>0</min>207 <min>0</min>
208 <max>1</max>208 <max>1</max>
209 <precision>0.01</precision>209 <precision>0.01</precision>
210Index: compiz/plugins/decor/decor.xml.in210Index: compiz-0.9.10/plugins/decor/decor.xml.in
211===================================================================211===================================================================
212--- compiz.orig/plugins/decor/decor.xml.in 2013-09-16 18:01:32.553411336 +0200212--- compiz-0.9.10.orig/plugins/decor/decor.xml.in 2013-10-08 17:02:17.016547820 +0200
213+++ compiz/plugins/decor/decor.xml.in 2013-09-16 18:01:32.537411397 +0200213+++ compiz-0.9.10/plugins/decor/decor.xml.in 2013-10-08 17:02:17.008547841 +0200
214@@ -31,7 +31,7 @@214@@ -31,7 +31,7 @@
215 <option name="active_shadow_opacity" type="float">215 <option name="active_shadow_opacity" type="float">
216 <_short>Shadow Opacity</_short>216 <_short>Shadow Opacity</_short>
@@ -247,10 +247,10 @@
247 </option>247 </option>
248 <option name="mipmap" type="bool">248 <option name="mipmap" type="bool">
249 <_short>Mipmap</_short>249 <_short>Mipmap</_short>
250Index: compiz/plugins/fade/fade.xml.in250Index: compiz-0.9.10/plugins/fade/fade.xml.in
251===================================================================251===================================================================
252--- compiz.orig/plugins/fade/fade.xml.in 2013-09-16 18:01:32.553411336 +0200252--- compiz-0.9.10.orig/plugins/fade/fade.xml.in 2013-10-08 17:02:17.016547820 +0200
253+++ compiz/plugins/fade/fade.xml.in 2013-09-16 18:01:32.541411382 +0200253+++ compiz-0.9.10/plugins/fade/fade.xml.in 2013-10-08 17:02:17.008547841 +0200
254@@ -10,6 +10,7 @@254@@ -10,6 +10,7 @@
255 </requirement>255 </requirement>
256 <relation type="after">256 <relation type="after">
@@ -268,10 +268,10 @@
268 </option>268 </option>
269 <option name="visual_bell" type="bell">269 <option name="visual_bell" type="bell">
270 <_short>Visual Bell</_short>270 <_short>Visual Bell</_short>
271Index: compiz/plugins/gnomecompat/gnomecompat.xml.in271Index: compiz-0.9.10/plugins/gnomecompat/gnomecompat.xml.in
272===================================================================272===================================================================
273--- compiz.orig/plugins/gnomecompat/gnomecompat.xml.in 2013-09-16 18:01:32.553411336 +0200273--- compiz-0.9.10.orig/plugins/gnomecompat/gnomecompat.xml.in 2013-10-08 17:02:17.016547820 +0200
274+++ compiz/plugins/gnomecompat/gnomecompat.xml.in 2013-09-16 18:01:32.541411382 +0200274+++ compiz-0.9.10/plugins/gnomecompat/gnomecompat.xml.in 2013-10-08 17:02:17.008547841 +0200
275@@ -53,6 +53,7 @@275@@ -53,6 +53,7 @@
276 <option name="run_command_terminal_key" type="key">276 <option name="run_command_terminal_key" type="key">
277 <_short>Open a terminal</_short>277 <_short>Open a terminal</_short>
@@ -280,10 +280,10 @@
280 </option>280 </option>
281 </group>281 </group>
282 </options>282 </options>
283Index: compiz/plugins/place/place.xml.in283Index: compiz-0.9.10/plugins/place/place.xml.in
284===================================================================284===================================================================
285--- compiz.orig/plugins/place/place.xml.in 2013-09-16 18:01:32.553411336 +0200285--- compiz-0.9.10.orig/plugins/place/place.xml.in 2013-10-08 17:02:17.016547820 +0200
286+++ compiz/plugins/place/place.xml.in 2013-09-16 18:01:32.541411382 +0200286+++ compiz-0.9.10/plugins/place/place.xml.in 2013-10-08 17:02:17.008547841 +0200
287@@ -20,8 +20,8 @@287@@ -20,8 +20,8 @@
288 <option name="mode" type="int">288 <option name="mode" type="int">
289 <_short>Placement Mode</_short>289 <_short>Placement Mode</_short>
@@ -295,10 +295,10 @@
295 <max>5</max>295 <max>5</max>
296 <desc>296 <desc>
297 <value>0</value>297 <value>0</value>
298Index: compiz/plugins/resize/resize.xml.in298Index: compiz-0.9.10/plugins/resize/resize.xml.in
299===================================================================299===================================================================
300--- compiz.orig/plugins/resize/resize.xml.in 2013-09-16 18:01:32.553411336 +0200300--- compiz-0.9.10.orig/plugins/resize/resize.xml.in 2013-10-08 17:02:17.016547820 +0200
301+++ compiz/plugins/resize/resize.xml.in 2013-09-16 18:01:32.541411382 +0200301+++ compiz-0.9.10/plugins/resize/resize.xml.in 2013-10-08 17:02:17.008547841 +0200
302@@ -28,7 +28,7 @@302@@ -28,7 +28,7 @@
303 <option name="mode" type="int">303 <option name="mode" type="int">
304 <_short>Default Resize Mode</_short>304 <_short>Default Resize Mode</_short>
@@ -343,10 +343,10 @@
343 </default>343 </default>
344 </option>344 </option>
345 <subgroup>345 <subgroup>
346Index: compiz/plugins/scale/scale.xml.in346Index: compiz-0.9.10/plugins/scale/scale.xml.in
347===================================================================347===================================================================
348--- compiz.orig/plugins/scale/scale.xml.in 2013-09-16 18:01:32.553411336 +0200348--- compiz-0.9.10.orig/plugins/scale/scale.xml.in 2013-10-08 17:02:17.016547820 +0200
349+++ compiz/plugins/scale/scale.xml.in 2013-09-16 18:01:32.541411382 +0200349+++ compiz-0.9.10/plugins/scale/scale.xml.in 2013-10-08 17:02:17.008547841 +0200
350@@ -19,14 +19,14 @@350@@ -19,14 +19,14 @@
351 <option name="spacing" type="int">351 <option name="spacing" type="int">
352 <_short>Spacing</_short>352 <_short>Spacing</_short>
@@ -435,10 +435,10 @@
435 </option>435 </option>
436 </group>436 </group>
437 </options>437 </options>
438Index: compiz/plugins/staticswitcher/staticswitcher.xml.in438Index: compiz-0.9.10/plugins/staticswitcher/staticswitcher.xml.in
439===================================================================439===================================================================
440--- compiz.orig/plugins/staticswitcher/staticswitcher.xml.in 2013-09-16 18:01:32.553411336 +0200440--- compiz-0.9.10.orig/plugins/staticswitcher/staticswitcher.xml.in 2013-10-08 17:02:17.016547820 +0200
441+++ compiz/plugins/staticswitcher/staticswitcher.xml.in 2013-09-16 18:01:32.541411382 +0200441+++ compiz-0.9.10/plugins/staticswitcher/staticswitcher.xml.in 2013-10-08 17:02:17.008547841 +0200
442@@ -11,7 +11,6 @@442@@ -11,7 +11,6 @@
443 <relation type="after">443 <relation type="after">
444 <plugin>composite</plugin>444 <plugin>composite</plugin>
@@ -515,10 +515,10 @@
515 <desc>515 <desc>
516 <value>0</value>516 <value>0</value>
517 <_name>None</_name>517 <_name>None</_name>
518Index: compiz/plugins/vpswitch/vpswitch.xml.in518Index: compiz-0.9.10/plugins/vpswitch/vpswitch.xml.in
519===================================================================519===================================================================
520--- compiz.orig/plugins/vpswitch/vpswitch.xml.in 2013-09-16 18:01:32.553411336 +0200520--- compiz-0.9.10.orig/plugins/vpswitch/vpswitch.xml.in 2013-10-08 17:02:17.016547820 +0200
521+++ compiz/plugins/vpswitch/vpswitch.xml.in 2013-09-16 18:01:32.541411382 +0200521+++ compiz-0.9.10/plugins/vpswitch/vpswitch.xml.in 2013-10-08 17:02:17.008547841 +0200
522@@ -95,13 +95,11 @@522@@ -95,13 +95,11 @@
523 <option name="next_button" type="button">523 <option name="next_button" type="button">
524 <_short>Move Next</_short>524 <_short>Move Next</_short>
@@ -533,10 +533,10 @@
533 <internal/>533 <internal/>
534 </option>534 </option>
535 <option name="initiate_button" type="button">535 <option name="initiate_button" type="button">
536Index: compiz/plugins/wall/wall.xml.in536Index: compiz-0.9.10/plugins/wall/wall.xml.in
537===================================================================537===================================================================
538--- compiz.orig/plugins/wall/wall.xml.in 2013-09-16 18:01:32.553411336 +0200538--- compiz-0.9.10.orig/plugins/wall/wall.xml.in 2013-10-08 17:02:17.016547820 +0200
539+++ compiz/plugins/wall/wall.xml.in 2013-09-16 18:01:32.541411382 +0200539+++ compiz-0.9.10/plugins/wall/wall.xml.in 2013-10-08 17:02:17.008547841 +0200
540@@ -30,12 +30,12 @@540@@ -30,12 +30,12 @@
541 <option name="miniscreen" type="bool">541 <option name="miniscreen" type="bool">
542 <_short>Show Live Viewport Previews</_short>542 <_short>Show Live Viewport Previews</_short>
@@ -693,10 +693,10 @@
693 </option>693 </option>
694 <option name="edgeflip_dnd" type="bool">694 <option name="edgeflip_dnd" type="bool">
695 <_short>Edge Flip DnD</_short>695 <_short>Edge Flip DnD</_short>
696Index: compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp696Index: compiz-0.9.10/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
697===================================================================697===================================================================
698--- compiz.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-09-16 18:01:32.553411336 +0200698--- compiz-0.9.10.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-10-08 17:02:17.016547820 +0200
699+++ compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-09-16 18:01:32.541411382 +0200699+++ compiz-0.9.10/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-10-08 17:02:17.008547841 +0200
700@@ -46,7 +46,7 @@700@@ -46,7 +46,7 @@
701 701
702 namespace702 namespace
@@ -706,11 +706,16 @@
706 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;706 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
707 707
708 bool Advance (Display *d, bool r)708 bool Advance (Display *d, bool r)
709Index: compiz/plugins/grid/grid.xml.in709Index: compiz-0.9.10/plugins/grid/grid.xml.in
710===================================================================710===================================================================
711--- compiz.orig/plugins/grid/grid.xml.in 2013-09-16 18:01:32.553411336 +0200711--- compiz-0.9.10.orig/plugins/grid/grid.xml.in 2013-10-08 17:02:17.016547820 +0200
712+++ compiz/plugins/grid/grid.xml.in 2013-09-16 18:01:49.693346061 +0200712+++ compiz-0.9.10/plugins/grid/grid.xml.in 2013-10-08 17:02:27.968519933 +0200
713@@ -73,7 +73,7 @@713@@ -68,12 +68,11 @@
714 <option name="put_maximize_key" type="key">
715 <_short>Maximize Key</_short>
716 <_long>Maximize window.</_long>
717- <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
718 </option>
714 <option name="put_restore_key" type="key">719 <option name="put_restore_key" type="key">
715 <_short>Restore</_short>720 <_short>Restore</_short>
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>721 <_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>
@@ -719,10 +724,10 @@
719 </option>724 </option>
720 </group>725 </group>
721 <group>726 <group>
722Index: compiz/plugins/ezoom/ezoom.xml.in727Index: compiz-0.9.10/plugins/ezoom/ezoom.xml.in
723===================================================================728===================================================================
724--- compiz.orig/plugins/ezoom/ezoom.xml.in 2013-09-16 18:01:32.553411336 +0200729--- compiz-0.9.10.orig/plugins/ezoom/ezoom.xml.in 2013-10-08 17:02:17.016547820 +0200
725+++ compiz/plugins/ezoom/ezoom.xml.in 2013-09-16 18:01:32.545411366 +0200730+++ compiz-0.9.10/plugins/ezoom/ezoom.xml.in 2013-10-08 17:02:17.012547830 +0200
726@@ -30,7 +30,7 @@731@@ -30,7 +30,7 @@
727 <option type="button" name="zoom_in_button">732 <option type="button" name="zoom_in_button">
728 <_short>Zoom In Button</_short>733 <_short>Zoom In Button</_short>
@@ -759,10 +764,10 @@
759 </option>764 </option>
760 </subgroup>765 </subgroup>
761 </group>766 </group>
762Index: compiz/plugins/expo/expo.xml.in767Index: compiz-0.9.10/plugins/expo/expo.xml.in
763===================================================================768===================================================================
764--- compiz.orig/plugins/expo/expo.xml.in 2013-09-16 18:01:32.553411336 +0200769--- compiz-0.9.10.orig/plugins/expo/expo.xml.in 2013-10-08 17:02:17.016547820 +0200
765+++ compiz/plugins/expo/expo.xml.in 2013-09-16 18:01:32.545411366 +0200770+++ compiz-0.9.10/plugins/expo/expo.xml.in 2013-10-08 17:02:17.012547830 +0200
766@@ -17,6 +17,7 @@771@@ -17,6 +17,7 @@
767 <plugin>wobbly</plugin>772 <plugin>wobbly</plugin>
768 <plugin>animation</plugin>773 <plugin>animation</plugin>
@@ -857,10 +862,10 @@
857 </option>862 </option>
858 <option name="ground_color1" type="color">863 <option name="ground_color1" type="color">
859 <_short>Ground Color (near)</_short>864 <_short>Ground Color (near)</_short>
860Index: compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml865Index: compiz-0.9.10/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
861===================================================================866===================================================================
862--- compiz.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-09-16 18:01:32.553411336 +0200867--- compiz-0.9.10.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-10-08 17:02:17.016547820 +0200
863+++ compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-09-16 18:01:32.545411366 +0200868+++ compiz-0.9.10/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-10-08 17:02:17.012547830 +0200
864@@ -10,6 +10,9 @@869@@ -10,6 +10,9 @@
865 <key type="s" name="command-screenshot">870 <key type="s" name="command-screenshot">
866 <default>"gnome-screenshot"</default>871 <default>"gnome-screenshot"</default>
@@ -881,10 +886,10 @@
881 <key type="s" name="command-12">886 <key type="s" name="command-12">
882 <default>""</default>887 <default>""</default>
883 </key>888 </key>
884Index: compiz/plugins/commands/commands.xml.in889Index: compiz-0.9.10/plugins/commands/commands.xml.in
885===================================================================890===================================================================
886--- compiz.orig/plugins/commands/commands.xml.in 2013-09-16 18:01:32.553411336 +0200891--- compiz-0.9.10.orig/plugins/commands/commands.xml.in 2013-10-08 17:02:17.016547820 +0200
887+++ compiz/plugins/commands/commands.xml.in 2013-09-16 18:01:32.545411366 +0200892+++ compiz-0.9.10/plugins/commands/commands.xml.in 2013-10-08 17:02:17.012547830 +0200
888@@ -117,7 +117,7 @@893@@ -117,7 +117,7 @@
889 <option name="command20" type="string">894 <option name="command20" type="string">
890 <_short>Command line 20</_short>895 <_short>Command line 20</_short>

Subscribers

People subscribed via source and target branches