Merge lp:~smspillaz/compiz-core/compiz-core.fix_969108 into lp:compiz-core

[Sam Spilsbury]

== Problem ==

priv->invisible was not updated when the window is mapped, even though it reflects whether or not the window is mapped

== Solution ==

update priv->invisible when window is mapped

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Daniel van Vugt (vanvugt)]

Argh. Another typo! This proposal is meant to be for bug 969102.

=== modified file 'NEWS'
--- NEWS	2012-03-30 07:55:31 +0000
+++ NEWS	2012-03-30 11:46:21 +0000
@@ -1,3 +1,10 @@
+Release 0.9.7.6 (2012-04-02 Sam Spilsbury <[e-mail]>)
+========================================================================
+
+Bugs fixed (https://launchpad.net/compiz-core/+milestone/0.9.7.6)
+
+    969102 - priv->invisible is not updated when the window is mapped
+
 Release 0.9.7.4 (2012-04-02 Daniel van Vugt <[e-mail]>)
 ============================================================================
 

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-03-30 06:26:33 +0000
+++ src/window.cpp	2012-03-30 11:46:21 +0000
@@ -1606,6 +1606,7 @@
 {
     windowNotify (CompWindowNotifyBeforeMap);
 
+    /* Previously not viewable */
     if (!isViewable ())
     {
 	if (priv->pendingMaps > 0)
@@ -1626,7 +1627,7 @@
 	if (!overrideRedirect ())
 	    screen->priv->setWmState (NormalState, priv->id);
 
-	priv->invisible  = true;
+	priv->invisible  = priv->isInvisible ();
 	priv->alive      = true;
 
 	priv->lastPong = screen->priv->lastPing;