Unity

Merge lp:~3v1n0/unity/compizplugin-activate-state into lp:unity

  1. compizplugin-activate-state
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3825
Proposed branch: lp:~3v1n0/unity/compizplugin-activate-state
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
unity-shared/PluginAdapter.cpp (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/compizplugin-activate-state
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Review via email: mp+222696@code.launchpad.net

Commit message

PluginAdapter: pass the state to compiz plugins activations

Fixes Scale triggering on DnD

Description of the change

It seems I introduced this regression in lp:~3v1n0/unity/call-valid-action-callbacks/+merge/217785 :'(

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-shared/PluginAdapter.cpp'
2--- unity-shared/PluginAdapter.cpp 2014-06-06 13:54:29 +0000
3+++ unity-shared/PluginAdapter.cpp 2014-06-10 17:23:56 +0000
4@@ -268,7 +268,7 @@
5
6 /* Initiate the selected action with the arguments */
7 if (CompAction::CallBack const& initiate_cb = primary_action_->initiate())
8- initiate_cb(action, 0, argument);
9+ initiate_cb(action, state, argument);
10 }
11
12 void MultiActionList::InitiateAll(CompOption::Vector const& extra_args, int state) const