From 0603cb240de50b180ec4322d7161c33c8792ab1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 30 May 2001 13:23:53 +0000 Subject: [PATCH] 'Logout' and 'Lock screen' keybindings don't really belong to kwin, they belong to kdesktop. svn path=/trunk/kdebase/kwin/; revision=99466 --- kwinbindings.cpp | 4 ---- workspace.cpp | 16 ---------------- workspace.h | 4 ---- 3 files changed, 24 deletions(-) diff --git a/kwinbindings.cpp b/kwinbindings.cpp index 37077e328e..6a4b30bc5e 100644 --- a/kwinbindings.cpp +++ b/kwinbindings.cpp @@ -43,9 +43,5 @@ keys->insertItem(i18n("Mouse emulation"),"Mouse emulation", "ALT+F12"); - keys->insertItem(i18n("Lock screen"),"Lock screen", "CTRL+ALT+L"); - - keys->insertItem(i18n("Logout"),"Logout", "CTRL+ALT+Delete"); - keys->insertItem(i18n("Kill Window"),"Kill Window", "CTRL+ALT+Escape"); diff --git a/workspace.cpp b/workspace.cpp index e7abb02a30..43fd254b40 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -2425,10 +2425,6 @@ void Workspace::createKeybindings(){ keys->connectItem( "Mouse emulation", this, SLOT( slotMouseEmulation() ) ); - keys->connectItem( "Lock screen", this, SLOT( slotLockScreen() ) ); - - keys->connectItem( "Logout", this, SLOT( slotLogout() ) ); - keys->connectItem( "Kill Window", this, SLOT( slotKillWindow() ) ); keys->readSettings(); walkThroughDesktopsKeycode = keys->currentKey( "Walk through desktops" ); @@ -2645,18 +2641,6 @@ void Workspace::slotMouseEmulation() } } -void Workspace::slotLockScreen() -{ - DCOPClient *client = kapp->dcopClient(); - client->send("kdesktop", "KScreensaverIface", "lock()", ""); -} - -void Workspace::slotLogout() -{ - kapp->requestShutDown(); -} - - /*! Kill Window feature, similar to xkill */ diff --git a/workspace.h b/workspace.h index 32be6d8046..f334898850 100644 --- a/workspace.h +++ b/workspace.h @@ -264,10 +264,6 @@ public slots: void slotResetAllClientsDelayed(); void slotResetAllClients(); - void slotLockScreen(); - - void slotLogout(); - void slotKillWindow(); private slots: