--- kdebase-3.4.0/kwin/workspace.cpp--	2005-04-12 10:04:29.104707036 -0400
+++ kdebase-3.4.0/kwin/workspace.cpp	2005-04-12 10:08:01.411836835 -0400
@@ -44,6 +44,8 @@ License. See the file "COPYING" for the 
 #include <X11/keysymdef.h>
 #include <X11/cursorfont.h>
 
+#include <kstandarddirs.h>
+
 extern Time qt_x_time;
 
 namespace KWinInternal
@@ -935,11 +937,23 @@ void Workspace::saveDesktopSettings()
 QStringList Workspace::configModules(bool controlCenter)
     {
     QStringList args;
+	if( KStandardDirs::default_menu_type_by_version()=="kde")
+	{
     args <<  "kde-kwindecoration.desktop";
     if (controlCenter)
         args << "kde-kwinoptions.desktop";
     else if (kapp->authorizeControlModule("kde-kwinoptions.desktop"))
         args  << "kwinactions" << "kwinfocus" <<  "kwinmoving" << "kwinadvanced" << "kwinrules" << "kwintranslucency";
+	}
+	else
+	{
+    args <<  "kwindecoration.desktop";
+    if (controlCenter)
+        args << "kwinoptions.desktop";
+    else if (kapp->authorizeControlModule("kwinoptions.desktop"))
+        args  << "kwinactions" << "kwinfocus" <<  "kwinmoving" << "kwinadvanced"
+ << "kwinrules" << "kwintranslucency";			
+	}
     return args;
     }