TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Improve and fix autostart support for KDE programs. This relates to issue #283

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: WJaguar <wjaguar@users.sourceforge.net>
(cherry picked from commit e5631254bf)
r14.1.x
Michele Calgaro 2 months ago
parent 66028a6198
commit 20badf1428
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File

19
tdeinit/autostart.cpp
Unescape View File

@ -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;
}

Write Preview
Loading…
Cancel
Save