Make the window shortcut dialog-popup work even when opened from the Alt+F3 popup.

svn path=/trunk/kdebase/kwin/; revision=379446

useractions.cpp

@@ -897,7 +897,9 @@ void Workspace::showWindowMenu( const QRect &pos, Client* cl )
 	else
 	    p->exec( QPoint( x, pos.top() - popupHeight ) );
         }
-    closeActivePopup();
+    // active popup may be already changed (e.g. the window shortcut dialog)
+    if( active_popup == p )
+        closeActivePopup();
     }
 
 /*!

utils.cpp

@@ -23,6 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <kxerrorhandler.h>
 #include <assert.h>
+#include <kdebug.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>