From c0ef0450c7731cc35b8763130d9334e382c513f7 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Mon, 15 Oct 2007 22:24:08 +0000
Subject: [PATCH] kcmshell renamed to kcmshell4 to fix co-installability
 between kdelibs3 and kdebase4-runtime

svn path=/trunk/KDE/kdebase/workspace/; revision=725652
---
 kcmkwin/kwincompositing/kwincompositing.desktop | 2 +-
 kcmkwin/kwindecoration/kwindecoration.desktop   | 2 +-
 kcmkwin/kwinoptions/kwinactions.desktop         | 2 +-
 kcmkwin/kwinoptions/kwinadvanced.desktop        | 2 +-
 kcmkwin/kwinoptions/kwinfocus.desktop           | 2 +-
 kcmkwin/kwinoptions/kwinmoving.desktop          | 2 +-
 kcmkwin/kwinoptions/kwinoptions.desktop         | 2 +-
 kcmkwin/kwinrules/kwinrules.desktop             | 2 +-
 workspace.cpp                                   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop
index 66c944b519..fcb2cfdc86 100644
--- a/kcmkwin/kwincompositing/kwincompositing.desktop
+++ b/kcmkwin/kwincompositing/kwincompositing.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell kwincompositing
+Exec=kcmshell4 kwincompositing
 Icon=preferences-system-windows-effects
 Type=Service
 ServiceTypes=KCModule
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index 5971325854..a83e83a2ed 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell kwindecoration
+Exec=kcmshell4 kwindecoration
 Icon=preferences-system-windows-decoration
 Type=Service
 ServiceTypes=KCModule
diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index 2ee0693a6a..136a7dfcd2 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Icon=kcmkwm
 Type=Service
 ServiceTypes=KCModule
-Exec=kcmshell kwinactions
+Exec=kcmshell4 kwinactions
 DocPath=kcontrol/windowmanagement/index.html#action-actions
 
 X-KDE-Library=kcm_kwinoptions
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index b7227fb7c6..d3d2b1752f 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Icon=kcmkwm
 Type=Service
 ServiceTypes=KCModule
-Exec=kcmshell kwinadvanced
+Exec=kcmshell4 kwinadvanced
 DocPath=kcontrol/windowmanagement/index.html#action-advanced
 
 X-KDE-Library=kcm_kwinoptions
diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop
index 96db208b63..c854c2289a 100644
--- a/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Icon=kcmkwm
 Type=Service
 ServiceTypes=KCModule
-Exec=kcmshell kwinfocus
+Exec=kcmshell4 kwinfocus
 DocPath=kcontrol/windowmanagement/index.html#action-focus
 
 X-KDE-Library=kcm_kwinoptions
diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop
index 8eb7170803..5e202121be 100644
--- a/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Icon=kcmkwm
 Type=Service
 ServiceTypes=KCModule
-Exec=kcmshell kwinmoving
+Exec=kcmshell4 kwinmoving
 DocPath=kcontrol/windowmanagement/index.html#action-moving
 
 X-KDE-Library=kcm_kwinoptions
diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
index 71e5253db1..2b34be4bc7 100644
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell kwinoptions
+Exec=kcmshell4 kwinoptions
 Icon=preferences-system-windows-behaviour
 Type=Service
 ServiceTypes=KCModule
diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
index 0bff342022..5015ec8dd4 100644
--- a/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kcmkwin/kwinrules/kwinrules.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell kwinrules
+Exec=kcmshell4 kwinrules
 Icon=preferences-system-windows-specific
 Type=Service
 ServiceTypes=KCModule
diff --git a/workspace.cpp b/workspace.cpp
index dbf384aa52..a383bd15b7 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1140,7 +1140,7 @@ QStringList Workspace::configModules(bool controlCenter)
 
 void Workspace::configureWM()
     {
-	KToolInvocation::kdeinitExec( "kcmshell", configModules(false) );
+	KToolInvocation::kdeinitExec( "kcmshell4", configModules(false) );
     }
 
 /*!