From 6919a58420aabbabb1fd0ef609bd888ef8f31c56 Mon Sep 17 00:00:00 2001
From: Matthias Ettrich <ettrich@troll.no>
Date: Sun, 7 Nov 1999 20:29:26 +0000
Subject: [PATCH] removed minicli stuff

svn path=/trunk/kdebase/kwin/; revision=33160
---
 workspace.cpp | 17 +++--------------
 workspace.h   |  4 +---
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index b6278bb4c3..bfe3dcd98e 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -12,8 +12,6 @@
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
-#include <kglobalaccel.h>
-#include <klocale.h>
 
 
 static Client* clientFactory( Workspace *ws, WId w )
@@ -67,11 +65,6 @@ Workspace::Workspace()
     grabKey(XK_Tab, ControlMask | ShiftMask);
 }
 
-void Workspace::slotExecuteCommand()
-{
-
-}
-
 Workspace::Workspace( WId rootwin )
 {
     qDebug("create MDI workspace for %d", rootwin );
@@ -139,11 +132,6 @@ void Workspace::init()
     XUngrabServer( qt_xdisplay() );
     popup = 0;
     propagateClients();
-
-    // KURT: Not sure where to put these..
-    keys = new KGlobalAccel();
-    keys->insertItem(i18n("Execute command"),  "Execute command", "ALT+F2");
-    keys->connectItem("Execute command", this, SLOT(slotExecuteCommand()));
 }
 
 Workspace::~Workspace()
@@ -173,8 +161,7 @@ bool Workspace::workspaceEvent( XEvent * e )
 	return c->windowEvent( e );
 
     if (!tab_grab && ! control_grab) { // don't process accelerators in tab or control mode
-        if (keys->x11EventFilter(e))
-            return true;
+	return true;
     }
 
     switch (e->type) {
@@ -334,6 +321,8 @@ bool Workspace::destroyClient( Client* c)
     c->invalidateWindow();
     delete c;
     clientHidden( c );
+    if ( c == desktop_client )
+	desktop_client = 0;
     propagateClients();
     return TRUE;
 }
diff --git a/workspace.h b/workspace.h
index 0dcda5953d..8714f65bc7 100644
--- a/workspace.h
+++ b/workspace.h
@@ -68,8 +68,6 @@ public:
 
     void makeFullScreen( Client* );
 
-protected slots:
-    void slotExecuteCommand();
 
 protected:
     bool keyPress( XKeyEvent key );
@@ -104,7 +102,7 @@ private:
 
     //experimental
     void setDecoration( int deco );
-    
+
     void propagateClients( bool onlyStacking = FALSE);
 };