Merge lp://staging/~sil2100/compiz-plugins-main/terminate_button into lp://staging/compiz-plugins-main
| Status: | Merged |
|---|---|
| Approved by: | Alan Griffiths |
| Approved revision: | 23 |
| Merged at revision: | 23 |
| Proposed branch: | lp://staging/~sil2100/compiz-plugins-main/terminate_button |
| Merge into: | lp://staging/compiz-plugins-main |
| Diff against target: |
15 lines (+0/-5) 1 file modified
shift/shift.xml.in (+0/-5) |
| To merge this branch: | bzr merge lp://staging/~sil2100/compiz-plugins-main/terminate_button |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alan Griffiths | Approve | ||
|
Review via email:
|
|||
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
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.
LGTM