Compiz

Merge lp:~sjakthol/compiz/0.9.8-fix-1048855 into lp:compiz/0.9.8

  1. 0.9.8-fix-1048855
  2. Merge into 0.9.8
Proposed by Sami Jaktholm
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3414
Merged at revision: 3414
Proposed branch: lp:~sjakthol/compiz/0.9.8-fix-1048855
Merge into: lp:compiz/0.9.8
Diff against target: 14 lines (+3/-1)
1 file modified
plugins/grid/src/grid.cpp (+3/-1)
To merge this branch: bzr merge lp:~sjakthol/compiz/0.9.8-fix-1048855
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
MC Return Approve
Review via email: mp+134876@code.launchpad.net

Commit message

Grid: Reset the currently handled window in the GridWindow destructor
only if the destroyed window was the handled one.

Currently completely unrelated GridWindow destruction will erase the
saved ID of the window Grid should be handling. This will break
the functionality if a GridWindow is destroyed while another window
is being dragged.

Fixes LP: #1067812 and LP: #1048855.

Description of the change

Backport the fix for bug 1067812 and bug 1048855 from trunk to 0.9.8 series. Fix seems to build and work fine with 0.9.8 branch.

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote :

+1. Also a candidate for Precise's Compiz 0.9.7 series IMHO.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Works for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/grid/src/grid.cpp'
2--- plugins/grid/src/grid.cpp 2012-09-24 11:31:11 +0000
3+++ plugins/grid/src/grid.cpp 2012-11-19 11:42:59 +0000
4@@ -1142,7 +1142,9 @@
5 if (gScreen->mGrabWindow == window)
6 gScreen->mGrabWindow = NULL;
7
8- gScreen->o[0].value ().set (0);
9+ CompWindow *w = screen->findWindow (CompOption::getIntOptionNamed (gScreen->o, "window"));
10+ if (w == window)
11+ gScreen->o[0].value ().set (0);
12 }
13
14 /* Initial plugin init function called. Checks to see if we are ABI

Subscribers

People subscribed via source and target branches