|
|
@ -130,6 +130,46 @@ AutoStart::loadAutoStartList()
|
|
|
|
if (config.readBoolEntry("Hidden", false))
|
|
|
|
if (config.readBoolEntry("Hidden", false))
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
|
|
|
// Check to see if the most important ( usually ~/.config/autostart or ~/.kde3/Autostart) XDG directory
|
|
|
|
|
|
|
|
// has overridden the Hidden directive and honor it if set to True
|
|
|
|
|
|
|
|
bool autostartOverriddenAndDisabled = false;
|
|
|
|
|
|
|
|
for(TQStringList::ConstIterator localit = kdefiles.begin();
|
|
|
|
|
|
|
|
localit != kdefiles.end();
|
|
|
|
|
|
|
|
++localit)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// Same local file name?
|
|
|
|
|
|
|
|
TQString localOuter;
|
|
|
|
|
|
|
|
TQString localInner;
|
|
|
|
|
|
|
|
int slashPos = (*it).findRev( '/', -1, TRUE );
|
|
|
|
|
|
|
|
if (slashPos == -1) {
|
|
|
|
|
|
|
|
localOuter = (*it);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
localOuter = (*it).mid(slashPos+1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
slashPos = (*localit).findRev( '/', -1, TRUE );
|
|
|
|
|
|
|
|
if (slashPos == -1) {
|
|
|
|
|
|
|
|
localInner = (*localit);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
localInner = (*localit).mid(slashPos+1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (localOuter == localInner) {
|
|
|
|
|
|
|
|
// Overridden!
|
|
|
|
|
|
|
|
// But is Hidden == True?
|
|
|
|
|
|
|
|
KDesktopFile innerConfig(*it, true);
|
|
|
|
|
|
|
|
if (innerConfig.readBoolEntry("Hidden", false)) {
|
|
|
|
|
|
|
|
// Override confirmed; exit speedily without autostarting
|
|
|
|
|
|
|
|
autostartOverriddenAndDisabled = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (autostartOverriddenAndDisabled == true)
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
if (config.hasKey("OnlyShowIn"))
|
|
|
|
if (config.hasKey("OnlyShowIn"))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
|
|
|
|
if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
|
|
|
|