Merge lp:~sil2100/compiz/raring_revert_3616 into lp:compiz/raring

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 3631
Merged at revision: 3631
Proposed branch: lp:~sil2100/compiz/raring_revert_3616
Merge into: lp:compiz/raring
Diff against target: 19 lines (+1/-8)
1 file modified
plugins/decor/src/decor.cpp (+1/-8)
To merge this branch: bzr merge lp:~sil2100/compiz/raring_revert_3616
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+151897@code.launchpad.net

Commit message

 Revert revision 3616, as the proposed fix causes serious regressions with Java Swing applications (LP: #1138517). That's no good!

Description of the change

- Problem:

The fix introduced in 3616 (fix for LP: #1110138) introduces a serious regression LP: #1138517.

- Fix:

Let's revert the fix for now, as it's better to have the earlier state than broken Java Swing applications.

- Tests:

N/A

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Might be better to actually look into this than hastily reverting.
Łukasz Zemczak has proposed merging lp:~sil2100/compiz/raring_revert_3616
into lp:compiz/raring.

Commit message:
 Revert revision 3616, as the proposed fix causes serious regressions with
Java Swing applications (LP: #1138517). That's no good!

Requested reviews:
  Compiz Maintainers (compiz-team)

For more details, see:
https://code.launchpad.net/~sil2100/compiz/raring_revert_3616/+merge/151897

- Problem:

The fix introduced in 3616 (fix for LP: #1110138) introduces a serious
regression LP: #1138517.

- Fix:

Let's revert the fix for now, as it's better to have the earlier state than
broken Java Swing applications.

- Tests:

N/A
--
https://code.launchpad.net/~sil2100/compiz/raring_revert_3616/+merge/151897
Your team Compiz Maintainers is requested to review the proposed merge of
lp:~sil2100/compiz/raring_revert_3616 into lp:compiz/raring.

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp 2013-02-26 01:08:15 +0000
+++ plugins/decor/src/decor.cpp 2013-03-06 09:20:28 +0000
@@ -2418,14 +2418,7 @@
            {
                w = screen->findWindow (event->xclient.window);
                if (w)
- {
- DecorWindow *dw = DecorWindow::get (w);
-
- /* Set the frameExtentsRequested flag so that we know to
- * at least update _NET_WM_FRAME_EXTENTS (LP: #1110138)
*/
- dw->frameExtentsRequested = true;
- dw->update (true);
- }
+ DecorWindow::get (w)->update (true);
            }

            mCommunicator.handleClientMessage (event->xclient);

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Sam, you are free to have a look at it if you have time for it. It seems the regression is worse than the fix, so let's get that roll in :)

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

You couldn't wait the ten minutes it takes for me to get home?
On 06/03/2013 5:36 PM, "Didier Roche" <email address hidden> wrote:

> Review: Approve
>
> Sam, you are free to have a look at it if you have time for it. It seems
> the regression is worse than the fix, so let's get that roll in :)
> --
> https://code.launchpad.net/~sil2100/compiz/raring_revert_3616/+merge/151897
> Your team Compiz Maintainers is subscribed to branch lp:compiz/raring.
>

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Sorry about that Sam, not sure if we can stop the merge from going in now anyway. The good thing is that the original change was rather small, so I hope re-introducing it, along with the proper fix, will not be that much troublesome. Well, now at least we're 'safe' in case we're not able to come up with a root-cause fix till the end of the day...

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

I suppose that's true. I'll have a quick look now.

On Wed, Mar 6, 2013 at 5:47 PM, Łukasz Zemczak
<email address hidden> wrote:
> Sorry about that Sam, not sure if we can stop the merge from going in now anyway. The good thing is that the original change was rather small, so I hope re-introducing it, along with the proper fix, will not be that much troublesome. Well, now at least we're 'safe' in case we're not able to come up with a root-cause fix till the end of the day...
> --
> https://code.launchpad.net/~sil2100/compiz/raring_revert_3616/+merge/151897
> Your team Compiz Maintainers is subscribed to branch lp:compiz/raring.

--
Sam Spilsbury

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/decor/src/decor.cpp'
2--- plugins/decor/src/decor.cpp 2013-02-26 01:08:15 +0000
3+++ plugins/decor/src/decor.cpp 2013-03-06 09:20:28 +0000
4@@ -2418,14 +2418,7 @@
5 {
6 w = screen->findWindow (event->xclient.window);
7 if (w)
8- {
9- DecorWindow *dw = DecorWindow::get (w);
10-
11- /* Set the frameExtentsRequested flag so that we know to
12- * at least update _NET_WM_FRAME_EXTENTS (LP: #1110138) */
13- dw->frameExtentsRequested = true;
14- dw->update (true);
15- }
16+ DecorWindow::get (w)->update (true);
17 }
18
19 mCommunicator.handleClientMessage (event->xclient);

Subscribers

People subscribed via source and target branches