|
|
|
@ -178,23 +178,14 @@ AutoStart::loadAutoStartList()
|
|
|
|
|
|
|
|
|
|
if (config.hasKey("OnlyShowIn"))
|
|
|
|
|
{
|
|
|
|
|
#ifdef WITH_OLD_XDG_STD
|
|
|
|
|
if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))
|
|
|
|
|
continue;
|
|
|
|
|
#else
|
|
|
|
|
if (!config.readListEntry("OnlyShowIn", ';').contains("TDE"))
|
|
|
|
|
continue;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
if (config.hasKey("NotShowIn"))
|
|
|
|
|
{
|
|
|
|
|
#ifdef WITH_OLD_XDG_STD
|
|
|
|
|
if ((config.readListEntry("NotShowIn", ';').contains("TDE")) || (config.readListEntry("NotShowIn", ';').contains("KDE")))
|
|
|
|
|
continue;
|
|
|
|
|
#else
|
|
|
|
|
if (config.readListEntry("NotShowIn", ';').contains("TDE"))
|
|
|
|
|
if (config.readListEntry("NotShowIn", ';').contains("TDE") ||
|
|
|
|
|
config.readListEntry("NotShowIn", ';').contains("KDE"))
|
|
|
|
|
continue;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AutoStartItem *item = new AutoStartItem;
|
|
|
|
@ -203,13 +194,13 @@ AutoStart::loadAutoStartList()
|
|
|
|
|
if (config.hasKey("X-TDE-autostart-after"))
|
|
|
|
|
item->startAfter = config.readEntry("X-TDE-autostart-after");
|
|
|
|
|
else
|
|
|
|
|
item->startAfter = config.readEntry("X-TDE-autostart-after");
|
|
|
|
|
item->startAfter = config.readEntry("X-KDE-autostart-after");
|
|
|
|
|
if( m_newStartup )
|
|
|
|
|
{
|
|
|
|
|
if (config.hasKey("X-TDE-autostart-phase"))
|
|
|
|
|
item->phase = config.readNumEntry("X-TDE-autostart-phase", 2);
|
|
|
|
|
else
|
|
|
|
|
item->phase = config.readNumEntry("X-TDE-autostart-phase", 2);
|
|
|
|
|
item->phase = config.readNumEntry("X-KDE-autostart-phase", 2);
|
|
|
|
|
if (item->phase < 0)
|
|
|
|
|
item->phase = 0;
|
|
|
|
|
}
|
|
|
|
@ -218,7 +209,7 @@ AutoStart::loadAutoStartList()
|
|
|
|
|
if (config.hasKey("X-TDE-autostart-phase"))
|
|
|
|
|
item->phase = config.readNumEntry("X-TDE-autostart-phase", 1);
|
|
|
|
|
else
|
|
|
|
|
item->phase = config.readNumEntry("X-TDE-autostart-phase", 1);
|
|
|
|
|
item->phase = config.readNumEntry("X-KDE-autostart-phase", 1);
|
|
|
|
|
if (item->phase < 1)
|
|
|
|
|
item->phase = 1;
|
|
|
|
|
}
|
|
|
|
|