1 --- kdebase-trinity-3.5.13.2/kioslave/settings/kio_settings.cc~ 2014-05-27 14:47:44.000000000 +0300
2 +++ kdebase-trinity-3.5.13.2/kioslave/settings/kio_settings.cc 2014-05-27 14:48:11.446790682 +0300
4 KServiceGroup::Ptr SettingsProtocol::findGroup(const TQString &relPath)
7 - TQString alreadyFound("Settings/");
8 + TQString alreadyFound("KDE-Settings/");
9 TQStringList rest = TQStringList::split('/', relPath);
11 kdDebug() << "Trying harder to find group " << relPath << endl;
13 servicePath.remove(0, 1); // remove starting '/'
15 if ( m_runMode == SettingsMode)
16 - servicePath = "Settings/" + servicePath;
17 + servicePath = "KDE-Settings/" + servicePath;
19 KServiceGroup::Ptr grp = KServiceGroup::group(servicePath);
22 groupPath.remove(0, 1); // remove starting '/'
24 if ( m_runMode == SettingsMode)
25 - groupPath.prepend("Settings/");
26 + groupPath.prepend("KDE-Settings/");
28 KServiceGroup::Ptr grp = KServiceGroup::group(groupPath);
31 QString relPath = g->relPath();
33 // Do not display the "Settings" menu group in Programs Mode.
34 - if( (m_runMode == ProgramsMode) && relPath.startsWith( "Settings" ) )
35 + if( (m_runMode == ProgramsMode) && relPath.startsWith( "KDE-Settings" ) )
37 kdDebug() << "SettingsProtocol: SKIPPING entry programs:/" << relPath << endl;
43 - relPath.remove(0, 9); // length("Settings/") ==9
44 + relPath.remove(0, 13); // length("KDE-Settings/") ==13
45 kdDebug() << "SettingsProtocol: adding entry settings:/" << relPath << endl;
46 createDirEntry(entry, groupCaption, "settings:/"+relPath, "inode/directory",g->icon());