Sophie

Sophie

distrib > Mandriva > cs4.0 > i586 > by-pkgid > 6f96ffda8b8309fb9c58db5e0ddbde2c > files > 68

kdebase-3.5.4-2.1.20060mlcs4.src.rpm

--- kdebase-3.4.92/kicker/kicker/core/containerarea.cpp~	2005-09-10 10:25:30.000000000 +0200
+++ kdebase-3.4.92/kicker/kicker/core/containerarea.cpp	2005-10-28 23:28:23.000000000 +0200
@@ -158,7 +158,55 @@
     dsize -= 560;
     QStringList buttons;
 
-    QFile f(locate("data", "kicker/default-apps"));
+    QFile f;
+    QString menuType = KStandardDirs::menu_type_by_version();
+    if( menuType == "kde" )
+      {
+   f.setName(locate("data", "kicker/default-apps"));
+      }
+    else if( menuType == "mdk" )
+      {
+   switch( KStandardDirs::mandriva_distro_version())
+     {
+    case KStandardDirs::DOWNLOAD:
+       f.setName(locate("data", "kicker/default-download-apps"));
+       break;
+     case KStandardDirs::POWERPACK:
+       f.setName(locate("data", "kicker/default-powerpack-apps"));
+       break;
+     case KStandardDirs::DISCOVERY:
+       f.setName(locate("data", "kicker/default-discovery-apps"));
+       break;
+     case KStandardDirs::POWERPACKPLUS:
+       f.setName(locate("data", "kicker/default-powerpackplus-apps"));
+       break;
+     default:
+       f.setName(locate("data", "kicker/default-apps"));
+       break;
+     }
+      }
+    else
+      {
+   switch( KStandardDirs::mandriva_distro_version())
+      {
+     case KStandardDirs::DOWNLOAD:
+       f.setName(locate("data", "kicker/default-download-apps-simplified"));
+       break;
+     case KStandardDirs::POWERPACK:
+       f.setName(locate("data", "kicker/default-powerpack-apps-simplified"));
+       break;
+     case KStandardDirs::DISCOVERY:
+       f.setName(locate("data", "kicker/default-discovery-apps-simplified"));
+       break;
+     case KStandardDirs::POWERPACKPLUS:
+       f.setName(locate("data", "kicker/default-powerpackplus-apps-simplified"));
+       break;
+     default:
+       f.setName(locate("data", "kicker/default-apps"));
+       break;
+     }
+
+      }
     if (f.open(IO_ReadOnly))
     {
         QTextStream is(&f);