Merge lp:~smspillaz/unity/unity4.0_fix_881190 into lp:unity/4.0

[Sam Spilsbury]

See https://code.launchpad.net/~smspillaz/unity/unity.fix_881190/+merge/85802

=== modified file 'plugins/unityshell/src/comptransientfor.cpp'
--- plugins/unityshell/src/comptransientfor.cpp	2011-08-23 14:47:38 +0000
+++ plugins/unityshell/src/comptransientfor.cpp	2011-12-15 15:37:26 +0000
@@ -55,13 +55,16 @@
 bool
 compiz::CompTransientForReader::isTransientFor (unsigned int ancestor)
 {
+  if (!ancestor ||
+      !priv->mWindow->id ())
   return priv->mWindow->transientFor () == ancestor;
 }
 
 bool
 compiz::CompTransientForReader::isGroupTransientFor (unsigned int clientLeader)
 {
-  if (!clientLeader)
+  if (!clientLeader ||
+      !priv->mWindow->id ())
     return false;
 
   if (priv->mWindow->transientFor () == None || priv->mWindow->transientFor () == screen->root ())
 
=== modified file 'plugins/unityshell/src/transientfor.cpp'
--- plugins/unityshell/src/transientfor.cpp	2011-08-26 10:37:35 +0000
+++ plugins/unityshell/src/transientfor.cpp	2011-12-15 15:37:26 +0000
@@ -51,9 +51,9 @@
   {
     if (actualType == XA_WINDOW && actualFormat == 32 && nLeft == 0 && nItems == 1)
     {
-	    Window *data = (Window *) prop;
+      Window *data = (Window *) prop;
 
-	    serverAncestor = *data;
+      serverAncestor = *data;
     }
 
     XFree (prop);
@@ -65,6 +65,10 @@
 bool
 compiz::X11TransientForReader::isTransientFor (unsigned int ancestor)
 {
+  if (!ancestor ||
+      !priv->mXid)
+    return false;
+
   return ancestor == getAncestor ();
 }
 
@@ -80,14 +84,18 @@
   std::vector<std::string> strings;
   std::list<Atom>   atoms;
 
+  if (!clientLeader ||
+      !priv->mXid)
+    return false;
+
   if (XGetWindowProperty (priv->mDpy, priv->mXid, wmClientLeader, 0L, 2L, false,
                           XA_WINDOW, &actualType, &actualFormat, &nItems, &nLeft, (unsigned char **)&prop) == Success)
   {
     if (actualType == XA_WINDOW && actualFormat == 32 && nLeft == 0 && nItems == 1)
     {
-	    Window *data = (Window *) prop;
+      Window *data = (Window *) prop;
 
-	    serverClientLeader = *data;
+      serverClientLeader = *data;
     }
 
     XFree (prop);
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-10-17 16:47:52 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-12-15 15:37:26 +0000
@@ -2551,7 +2551,7 @@
 
   UnityShowdesktopHandler::animating_windows.remove (window);
 
-  if (mMinimizeHandler)
+  if (mMinimizeHandler && !window->destroyed ())
   {
     unminimize ();
     window->focusSetEnabled (this, false);
@@ -2559,9 +2559,10 @@
     window->unminimizeSetEnabled (this, false);
     window->minimizedSetEnabled (this, false);
     window->minimize ();
-
-    mMinimizeHandler.reset ();
   }
+
+  mMinimizeHandler.reset ();
+
   if (mShowdesktopHandler)
     delete mShowdesktopHandler;