summaryrefslogtreecommitdiffstats
path: root/tdeinit
diff options
context:
space:
mode:
Diffstat (limited to 'tdeinit')
-rw-r--r--tdeinit/autostart.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/tdeinit/autostart.cpp b/tdeinit/autostart.cpp
index 7682c5c4a..79e71c7f6 100644
--- a/tdeinit/autostart.cpp
+++ b/tdeinit/autostart.cpp
@@ -118,10 +118,13 @@ AutoStart::loadAutoStartList()
TQStringList kdefiles = TDEGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
files += kdefiles;
- for(TQStringList::ConstIterator it = files.begin();
- it != files.end();
- ++it)
+ for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it)
{
+ // Explicitly skip autostart files from KDE
+ if ((*it).contains("org.kde") || (*it).startsWith("/etc/kde/xdg/autostart"))
+ {
+ continue;
+ }
KDesktopFile config(*it, true);
if (config.hasKey("X-TDE-autostart-condition")) {
if (!startCondition(config.readEntry("X-TDE-autostart-condition")))