Merge lp:~hikiko/compiz/0.9.11-fix-1245886 into lp:compiz/0.9.11

[Eleni Maria Stea]

It fixes the bug #1245886. In DecorScreen::handleEvent compiz shouldn't try to handle any events if there's no active window yet.

It fixes the bug #1245886. In DecorScreen::handleEvent compiz shouldn't try to handle any events if there's no active window yet.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3798
http://jenkins.qa.ubuntu.com/job/compiz-ci/299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/112

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-ci/299/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3798
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-0.9.11-ci/1/rebuild

review: Approve (continuous-integration)

[MC Return (mc-return)]

+1.

Are the changes (additional brackets) in src/window.cpp really needed ?

So adding

if (!activeWindow)
    return;

to decor.cpp, DecorScreen::handleEvent () would be enough imho...

The commit message could be nicer also ;)

review: Approve

[Eleni Maria Stea (hikiko)]

I got a warning for the branches when I performed static analysis, that's why I added them but they don't really fix anything, so, I can remove them. Sorry for the short commit message :)

[Eleni Maria Stea (hikiko)]

sorry, :s/branches/brackets :)

[MC Return (mc-return)]

I cannot test this properly at the moment, hope someone else will do that soonish...

Thanks for improving the commit message.

[lp:~hikiko/compiz/0.9.11-fix-1245886]

3799. By Eleni Maria Stea on 2013-10-29

removed not really necessary brackets to have a cleaner diff

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3799
http://jenkins.qa.ubuntu.com/job/compiz-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/113

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-ci/300/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3799
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-0.9.11-ci/2/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Good.

review: Approve

[Christopher Townsend (townsend)]

This change is unfortunately causing a bad side effect that all windows are "hung" when restarting Compiz and rendering the desktop unusable. I'm not sure how to properly fix this, so in the mean time, I'm going to propose another branch that reverts this change.

[Eleni Maria Stea (hikiko)]

I didn't see any issue but maybe I was just too lucky! I will test it a few more times! If you only get the crash after my change we should definately revert the branch! :s Sorry!

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2013-09-06 16:15:55 +0000
+++ plugins/decor/src/decor.cpp	2013-10-29 16:15:27 +0000
@@ -2442,6 +2442,10 @@
 DecorScreen::handleEvent (XEvent *event)
 {
     Window  activeWindow = screen->activeWindow ();
+    if(!activeWindow) {
+    	return;
+    }
+
     CompWindow *w;
 
     switch (event->type) {