kcmshell renamed to kcmshell4 to fix co-installability between kdelibs3 and kdebase4-runtime

svn path=/trunk/KDE/kdebase/workspace/; revision=725652
17 years ago · c0ef0450c7
parent bb593de8fc
commit c0ef0450c7
9 changed files with 9 additions and 9 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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) );
    }

 /*!