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

[Łukasz Zemczak]

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.

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.

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'shift.xml.in'
--- shift.xml.in	2010-11-05 05:22:39 +0000
+++ shift.xml.in	2012-03-16 09:27:23 +0000
@@ -47,11 +47,6 @@
 					<_short>Initiate (All Workspaces)</_short>
 					<_long>Initiate switcher (All Workspaces).</_long>
 				</option>
-				<option name="terminate_button" type="button">
-					<_short>Terminate</_short>
-					<_long>Terminate switcher.</_long>
-					<default>Button3</default>
-				</option>
 				<option name="next_key" type="key">
 					<_short>Next Window</_short>
 					<_long>Show switcher if not visible and select next window.</_long>