Merge lp:~vanvugt/compiz-core/fix-981703 into lp:compiz-core

[Daniel van Vugt]

Revert r3092 because it was causing a worse regression (LP: #981703)

This reverts the fix for LP: #980026.

[Alan Griffiths (alan-griffiths)]

Odd. I can't reproduce #981703, so I can't tell if this fixes it.

[Sam Spilsbury (smspillaz)]

review: Approve

[Sam Spilsbury (smspillaz)]

*sigh*

[Sam Spilsbury (smspillaz)]

As an aside - has anybody who can reproduce the bug looked into whats causing it? I know that its to do with the input frame window not being created, but since I can't reproduce this particular issue I'd like to see some movement on getting both the bug in this revision and the "regression" fixed.

[Daniel van Vugt (vanvugt)]

Sam - No, I won't dedicate more of my time to this right now. At the first opportunity I will be working on more severe issues than bug 980026.

[Daniel van Vugt (vanvugt)]

Hmm, maybe I will have to look into that bug. The latest version of the work branch causes the same issue.

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-04-12 13:21:45 +0000
+++ src/window.cpp	2012-04-16 09:54:22 +0000
@@ -7171,6 +7171,7 @@
     XDestroyWindow (screen->dpy (), serverFrame);
     XDestroyWindow (screen->dpy (), wrapper);
 
+    window->windowNotify (CompWindowNotifyUnreparent);
     /* This window is no longer "managed" in the
      * reparenting sense so clear its pending event
      * queue ... though maybe in future it would
@@ -7181,7 +7182,4 @@
     frame = None;
     wrapper = None;
     serverFrame = None;
-
-    // Finally, (i.e. after updating state) notify the change
-    window->windowNotify (CompWindowNotifyUnreparent);
 }