Sophie

Sophie

distrib > Mandriva > 2007.1 > i586 > by-pkgid > 957da2639ff0ff03ed8e388494a58800 > files > 101

kdebase4-3.80.3-0.20070311.6mdv2007.1.src.rpm

--- kdebase-3.4.92/kicker/kicker/core/kicker.cpp--	2005-11-07 09:39:20.000000000 +0100
+++ kdebase-3.4.92/kicker/kicker/core/kicker.cpp	2005-11-07 09:39:35.000000000 +0100
@@ -299,19 +299,37 @@
 QStringList Kicker::configModules(bool controlCenter)
 {
     QStringList args;
-
-    if (controlCenter)
-    {
-        args << "kde-panel.desktop";
-    }
+	if( KStandardDirs::default_menu_type_by_version()=="kde")
+		{	
+    	if (controlCenter)
+    	{
+       		args << "kde-panel.desktop";
+    	}
+    	else
+    	{
+        	args << "kde-kicker_config_arrangement.desktop"
+            	 << "kde-kicker_config_hiding.desktop"
+             	<< "kde-kicker_config_menus.desktop"
+             	<< "kde-kicker_config_appearance.desktop";
+    	}
+    	args << "kde-kcmtaskbar.desktop";
+	}
     else
     {
-        args << "kde-kicker_config_arrangement.desktop"
-             << "kde-kicker_config_hiding.desktop"
-             << "kde-kicker_config_menus.desktop"
-             << "kde-kicker_config_appearance.desktop";
+    	if (controlCenter)
+    	{
+       		args  << "panel.desktop";
+    	}
+    	else
+    	{
+        	args  << "kicker_config_arrangement.desktop"
+                 	<< "kicker_config_hiding.desktop"
+                	<< "kicker_config_menus.desktop"
+                	<< "kicker_config_appearance.desktop";
+
+    	}
+    	args << "kcmtaskbar.desktop";
     }
-    args << "kde-kcmtaskbar.desktop";
     return args;
 }