--- kdebase-3.2/kcontrol/kcontrol/global.cpp.kcontrol_global 2004-02-17 23:53:51.000000000 +0100 +++ kdebase-3.2/kcontrol/kcontrol/global.cpp 2004-02-18 17:37:04.000000000 +0100 @@ -25,7 +25,7 @@ #include <kdebug.h> #include <kapplication.h> #include <kuser.h> - +#include <kstandarddirs.h> #include <qobjectlist.h> #include <qaccel.h> @@ -85,18 +85,29 @@ QString KCGlobal::baseGroup() kdDebug(1208) << "Found basegroup = " << _baseGroup << endl; return _baseGroup; } + QString mdkMenu = KStandardDirs::menu_type_by_version(); // Compatibility with old behaviour, in case of missing .directory files. if (_baseGroup.isEmpty()) { if (_infocenter) { kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl; - _baseGroup = QString::fromLatin1("Settings/Information/"); + if( mdkMenu == "mdk" ) + _baseGroup = QString::fromLatin1("System/Configuration/KDE/Information/"); + else if( mdkMenu == "mdk-simplified") + _baseGroup = QString::fromLatin1("Administer Your System/Use More Administration Tools/Configuration/KDE/Information/"); + else + _baseGroup = QString::fromLatin1("Settings/"); } else { kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl; - _baseGroup = QString::fromLatin1("Settings/"); + if( mdkMenu == "mdk" ) + _baseGroup = QString::fromLatin1("System/Configuration/KDE/"); + else if( mdkMenu == "mdk-simplified") + _baseGroup = QString::fromLatin1("Administer Your System/Use More Administration Tools/Configuration/KDE/"); + else + _baseGroup = QString::fromLatin1("Settings/"); } } }