compcomm-plugins-main

Merge lp:~vanvugt/compcomm-plugins-main/fix-977743 into lp:~compiz/compcomm-plugins-main/ubuntu

  1. fix-977743
  2. Merge into ubuntu
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 267
Proposed branch: lp:~vanvugt/compcomm-plugins-main/fix-977743
Merge into: lp:~compiz/compcomm-plugins-main/ubuntu
Diff against target: 118 lines (+22/-27)
1 file modified
debian/patches/ubuntu_config.patch (+22/-27)
To merge this branch: bzr merge lp:~vanvugt/compcomm-plugins-main/fix-977743
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+101339@code.launchpad.net

Description of the change

Fix typos in animation.xml.in causing mismatched animations of menus and
tooltips (LP: #977743)

Fixed:
  * Menus: No open animation, but fade out on close.
  * Tooltips: No close animation, but fade in on open.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/ubuntu_config.patch'
2--- debian/patches/ubuntu_config.patch 2012-04-02 08:21:51 +0000
3+++ debian/patches/ubuntu_config.patch 2012-04-10 07:25:22 +0000
4@@ -1,18 +1,16 @@
5-Index: compiz-plugins-main-0.9.7.0~bzr19/animation/animation.xml.in
6+Index: compiz-plugins-main-0.9.7.0/animation/animation.xml.in
7 ===================================================================
8---- compiz-plugins-main-0.9.7.0~bzr19.orig/animation/animation.xml.in 2012-02-09 17:53:27.000000000 +0100
9-+++ compiz-plugins-main-0.9.7.0~bzr19/animation/animation.xml.in 2012-03-28 09:13:23.188188386 +0200
10-@@ -35,8 +35,8 @@
11+--- compiz-plugins-main-0.9.7.0.orig/animation/animation.xml.in 2012-04-10 14:26:17.604787000 +0800
12++++ compiz-plugins-main-0.9.7.0/animation/animation.xml.in 2012-04-10 14:29:56.469176555 +0800
13+@@ -35,7 +35,7 @@
14 <extensible/>
15 <sort start="2"/>
16 <default>
17 - <value>animation:Zoom</value>
18-- <value>animation:Fade</value>
19 + <value>animation:Glide 2</value>
20-+ <value>animation:None</value>
21+ <value>animation:Fade</value>
22 <value>animation:Fade</value>
23 </default>
24- </option>
25 @@ -47,9 +47,9 @@
26 <min>50</min>
27 <max>4000</max>
28@@ -37,18 +35,15 @@
29 <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
30 </default>
31 </option>
32-@@ -101,9 +101,9 @@
33+@@ -101,7 +101,7 @@
34 <extensible/>
35 <sort start="2"/>
36 <default>
37 - <value>animation:Zoom</value>
38-- <value>animation:Fade</value>
39 + <value>animation:Glide 2</value>
40 <value>animation:Fade</value>
41-+ <value>animation:None</value>
42+ <value>animation:Fade</value>
43 </default>
44- </option>
45- <option name="close_durations" type="list">
46 @@ -113,9 +113,9 @@
47 <min>50</min>
48 <max>4000</max>
49@@ -145,10 +140,10 @@
50 <min>0</min>
51 <max>1</max>
52 <precision>0.01</precision>
53-Index: compiz-plugins-main-0.9.7.0~bzr19/staticswitcher/staticswitcher.xml.in
54+Index: compiz-plugins-main-0.9.7.0/staticswitcher/staticswitcher.xml.in
55 ===================================================================
56---- compiz-plugins-main-0.9.7.0~bzr19.orig/staticswitcher/staticswitcher.xml.in 2012-02-09 17:53:27.000000000 +0100
57-+++ compiz-plugins-main-0.9.7.0~bzr19/staticswitcher/staticswitcher.xml.in 2012-03-28 09:13:23.188188386 +0200
58+--- compiz-plugins-main-0.9.7.0.orig/staticswitcher/staticswitcher.xml.in 2012-04-10 14:26:17.604787000 +0800
59++++ compiz-plugins-main-0.9.7.0/staticswitcher/staticswitcher.xml.in 2012-04-10 14:26:17.604787000 +0800
60 @@ -10,7 +10,6 @@
61 <relation type="after">
62 <plugin>composite</plugin>
63@@ -225,10 +220,10 @@
64 <desc>
65 <value>0</value>
66 <_name>None</_name>
67-Index: compiz-plugins-main-0.9.7.0~bzr19/vpswitch/vpswitch.xml.in
68+Index: compiz-plugins-main-0.9.7.0/vpswitch/vpswitch.xml.in
69 ===================================================================
70---- compiz-plugins-main-0.9.7.0~bzr19.orig/vpswitch/vpswitch.xml.in 2012-02-09 17:53:27.000000000 +0100
71-+++ compiz-plugins-main-0.9.7.0~bzr19/vpswitch/vpswitch.xml.in 2012-03-28 09:13:23.188188386 +0200
72+--- compiz-plugins-main-0.9.7.0.orig/vpswitch/vpswitch.xml.in 2012-04-10 14:26:17.604787000 +0800
73++++ compiz-plugins-main-0.9.7.0/vpswitch/vpswitch.xml.in 2012-04-10 14:26:17.604787000 +0800
74 @@ -95,13 +95,11 @@
75 <option name="next_button" type="button">
76 <_short>Move Next</_short>
77@@ -243,10 +238,10 @@
78 <internal/>
79 </option>
80 <option name="initiate_button" type="button">
81-Index: compiz-plugins-main-0.9.7.0~bzr19/wall/wall.xml.in
82+Index: compiz-plugins-main-0.9.7.0/wall/wall.xml.in
83 ===================================================================
84---- compiz-plugins-main-0.9.7.0~bzr19.orig/wall/wall.xml.in 2012-02-09 17:53:27.000000000 +0100
85-+++ compiz-plugins-main-0.9.7.0~bzr19/wall/wall.xml.in 2012-03-28 09:13:23.188188386 +0200
86+--- compiz-plugins-main-0.9.7.0.orig/wall/wall.xml.in 2012-04-10 14:26:17.604787000 +0800
87++++ compiz-plugins-main-0.9.7.0/wall/wall.xml.in 2012-04-10 14:26:17.604787000 +0800
88 @@ -31,12 +31,12 @@
89 <option name="miniscreen" type="bool">
90 <_short>Show Live Viewport Previews</_short>
91@@ -394,10 +389,10 @@
92 </option>
93 <option name="edgeflip_dnd" type="bool">
94 <_short>Edge Flip DnD</_short>
95-Index: compiz-plugins-main-0.9.7.0~bzr19/grid/grid.xml.in
96+Index: compiz-plugins-main-0.9.7.0/grid/grid.xml.in
97 ===================================================================
98---- compiz-plugins-main-0.9.7.0~bzr19.orig/grid/grid.xml.in 2012-02-09 17:53:27.000000000 +0100
99-+++ compiz-plugins-main-0.9.7.0~bzr19/grid/grid.xml.in 2012-03-28 09:13:23.188188386 +0200
100+--- compiz-plugins-main-0.9.7.0.orig/grid/grid.xml.in 2012-04-10 14:26:17.604787000 +0800
101++++ compiz-plugins-main-0.9.7.0/grid/grid.xml.in 2012-04-10 14:26:17.604787000 +0800
102 @@ -23,17 +23,16 @@
103 <option name="put_center_key" type="key">
104 <_short>Put Center</_short>
105@@ -426,10 +421,10 @@
106 </option>
107 <option name="put_restore_key" type="key">
108 <_short>Restore</_short>
109-Index: compiz-plugins-main-0.9.7.0~bzr19/ezoom/ezoom.xml.in
110+Index: compiz-plugins-main-0.9.7.0/ezoom/ezoom.xml.in
111 ===================================================================
112---- compiz-plugins-main-0.9.7.0~bzr19.orig/ezoom/ezoom.xml.in 2012-02-09 17:53:27.000000000 +0100
113-+++ compiz-plugins-main-0.9.7.0~bzr19/ezoom/ezoom.xml.in 2012-03-28 09:14:04.132391405 +0200
114+--- compiz-plugins-main-0.9.7.0.orig/ezoom/ezoom.xml.in 2012-04-10 14:26:17.604787000 +0800
115++++ compiz-plugins-main-0.9.7.0/ezoom/ezoom.xml.in 2012-04-10 14:26:17.604787000 +0800
116 @@ -29,7 +29,6 @@
117 <option type="button" name="zoom_in_button">
118 <_short>Zoom In</_short>

Subscribers

People subscribed via source and target branches

to all changes: