summaryrefslogtreecommitdiffstats
path: root/tdeinit/autostart.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2024-07-24 18:42:35 +0900
committerMichele Calgaro <[email protected]>2024-07-24 18:45:10 +0900
commite5631254bf61664cebc20042caf752b6ef4f0860 (patch)
tree6c823fdbb06ac0ff83696435edcf407398a70533 /tdeinit/autostart.cpp
parentad20d79b7f0f079058484903d435c2dd2758411c (diff)
downloadtdelibs-e5631254bf61664cebc20042caf752b6ef4f0860.tar.gz
tdelibs-e5631254bf61664cebc20042caf752b6ef4f0860.zip
Improve and fix autostart support for KDE programs. This relates to issue #283
Signed-off-by: Michele Calgaro <[email protected]> Signed-off-by: WJaguar <[email protected]>
Diffstat (limited to 'tdeinit/autostart.cpp')
-rw-r--r--tdeinit/autostart.cpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/tdeinit/autostart.cpp b/tdeinit/autostart.cpp
index 3f49dfc1d..7682c5c4a 100644
--- a/tdeinit/autostart.cpp
+++ b/tdeinit/autostart.cpp
@@ -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;
}