--- kdelibs-3.2/kded/kbuildsycoca.cpp.menu_search 2004-02-08 08:24:46.000000000 +0100 +++ kdelibs-3.2/kded/kbuildsycoca.cpp 2004-02-09 14:27:43.000000000 +0100 @@ -373,8 +373,35 @@ bool KBuildSycoca::build() connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), this, SLOT(slotCreateEntry(const QString &, KService **))); - - VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); + QString _menuType = "applications.menu"; + QString _versionMenu = KStandardDirs::menu_type_by_version(); + if( _versionMenu == "kde" ) + _menuType = "applications.menu"; + else if( _versionMenu == "mdk" ) + { + switch( KStandardDirs::mandrake_distro_version() ) + { + case KStandardDirs::POWERPACK: + _menuType = "applications-mdk.menu"; + break; + case KStandardDirs::DISCOVERY: + _menuType = "applications-mdk.menu"; + break; + case KStandardDirs::POWERPACKPLUS: + _menuType = "applications-mdk.menu"; + break; + case KStandardDirs::DOWNLOAD: + _menuType = "applications-mdk.menu"; + break; + default: + _menuType = "applications-mdk.menu"; + break; + } + } + else + _menuType = "applications-simplified.menu"; + + VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(_menuType, true); KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); entry->setLayoutInfo(kdeMenu->layoutList);