Merge lp:~3v1n0/compiz-expo-plugin/oneiric.fix_875557 into lp:~compiz-team/compiz-expo-plugin/oneiric

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 157
Merged at revision: 157
Proposed branch: lp:~3v1n0/compiz-expo-plugin/oneiric.fix_875557
Merge into: lp:~compiz-team/compiz-expo-plugin/oneiric
Diff against target: 12 lines (+0/-2)
1 file modified
src/expo.cpp (+0/-2)
To merge this branch: bzr merge lp:~3v1n0/compiz-expo-plugin/oneiric.fix_875557
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Review via email: mp+83489@code.launchpad.net

Description of the change

Don't reset the dndState on expo terminate.
doing this causes the dndFini function not to work when called, and so not to release the grab on selected window(s).
This shouldn't lead to issues in the case that dndFini is not called, since the dndState variable is reset to None once expo is fired again.

To post a comment you must log in.
Revision history for this message
Omer Akram (om26er) wrote :

Marco, do you plan to work on test case for this fix? seems we can't SRU unless its fixed in precise(with testcase)

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

It's actually very hard to test this without autopilot support.
We need that, so I can write a test.

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Since this is something thats more or less an interaction issue with other plugins and not really something that can be easily manually tested because it is a race condition, I'm in favor of just merging this without tests.

Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/expo.cpp'
2--- src/expo.cpp 2011-10-05 06:48:41 +0000
3+++ src/expo.cpp 2011-11-26 20:47:23 +0000
4@@ -148,8 +148,6 @@
5 else
6 vpUpdateMode = VPUpdateMouseOver;
7
8- dndState = DnDNone;
9-
10 screen->removeAction (&optionGetDndButton ());
11 screen->removeAction (&optionGetExitButton ());
12 screen->removeAction (&optionGetNextVpButton ());

Subscribers

People subscribed via source and target branches