Merge lp:~sil2100/compiz-shift-plugin/terminate_button into lp:compiz-shift-plugin

Proposed by Łukasz Zemczak on 2012-03-16
Status: Merged
Merged at revision: 117
Proposed branch: lp:~sil2100/compiz-shift-plugin/terminate_button
Merge into: lp:compiz-shift-plugin
Diff against target: 15 lines (+0/-5)
1 file modified
shift.xml.in (+0/-5)
To merge this branch: bzr merge lp:~sil2100/compiz-shift-plugin/terminate_button
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-03-16 Approve on 2012-03-16
Review via email: mp+97816@code.launchpad.net

Commit message

Remove the terminate_button option as it's not referenced anywhere in the code.

The terminate_button option was defined in XML but is not actually used or referenced anywhere in the plugin code. Therefore actually using the binding resulted in compiz crashing. Fixes #954079.

Description of the change

Forwarded from the merge proposal to compiz-plugins-main:

Problem:

By default, the shift plugin has the terminate_button option set to Button3 (right-click). Whenever the plugin was enabled, compiz would die horribly every time the right mouse button was used (bug #954079). By browsing through the code, I noticed that actually the terminate_button option is not used or referenced anywhere in the code.

Fix:

Removing the actual terminate_button option in overall. No use in keeping something that is not used and breaks the system.

Tests:

After applying this fix, the shift plugin can be enabled and right-clicks no longer result with compiz crashing.

To post a comment you must log in.
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shift.xml.in'
2--- shift.xml.in 2010-11-05 05:22:39 +0000
3+++ shift.xml.in 2012-03-16 09:27:23 +0000
4@@ -47,11 +47,6 @@
5 <_short>Initiate (All Workspaces)</_short>
6 <_long>Initiate switcher (All Workspaces).</_long>
7 </option>
8- <option name="terminate_button" type="button">
9- <_short>Terminate</_short>
10- <_long>Terminate switcher.</_long>
11- <default>Button3</default>
12- </option>
13 <option name="next_key" type="key">
14 <_short>Next Window</_short>
15 <_long>Show switcher if not visible and select next window.</_long>

Subscribers

People subscribed via source and target branches