Compiz Viewport Switcher Plugin

Merge lp:~compiz-team/compiz-vpswitch-plugin/compiz-vpswitch-plugin.fix_772151 into lp:compiz-vpswitch-plugin

  1. compiz-vpswitch-plugin.fix_772151
  2. Merge into 0.9.5
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 56
Proposed branch: lp:~compiz-team/compiz-vpswitch-plugin/compiz-vpswitch-plugin.fix_772151
Merge into: lp:compiz-vpswitch-plugin
Diff against target: 23 lines (+4/-2)
1 file modified
src/vpswitch.cpp (+4/-2)
To merge this branch: bzr merge lp:~compiz-team/compiz-vpswitch-plugin/compiz-vpswitch-plugin.fix_772151
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+78938@code.launchpad.net

Description of the change

Fix bug 772151

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/vpswitch.cpp'
2--- src/vpswitch.cpp 2010-07-17 07:05:49 +0000
3+++ src/vpswitch.cpp 2011-10-11 10:40:30 +0000
4@@ -50,7 +50,8 @@
5 opt.type () == CompOption::TypeButton ||
6 opt.type () == CompOption::TypeEdge ||
7 opt.type () == CompOption::TypeBell)
8- if (opt.name () == optionGetInitAction ())
9+ if (opt.name () == optionGetInitAction () &&
10+ opt.value ().action ().initiate ())
11 {
12 rv = opt.value ().action ().initiate ()
13 (action, state, options);
14@@ -82,7 +83,8 @@
15 opt.type () == CompOption::TypeButton ||
16 opt.type () == CompOption::TypeEdge ||
17 opt.type () == CompOption::TypeBell)
18- if (opt.name () == optionGetInitAction ())
19+ if (opt.name () == optionGetInitAction () &&
20+ opt.value ().action ().terminate ())
21 {
22 rv = opt.value ().action ().terminate ()
23 (action, state, options);

Subscribers

People subscribed via source and target branches

to all changes: