1 files changed, 19 insertions, 25 deletions

diff --git a/tdeinit/autostart.cpp b/tdeinit/autostart.cpp
index 3f49dfc1d..c5ebb794a 100644
--- a/tdeinit/autostart.cpp
+++ b/tdeinit/autostart.cpp
@@ -23,9 +23,9 @@
 #include "autostart.h"
 
 #include <tdeconfig.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <stdlib.h>
 
@@ -118,17 +118,20 @@ 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)
    {
-       KDesktopFile config(*it, true);
+       // Explicitly skip autostart files from KDE
+       if ((*it).contains("org.kde") || (*it).startsWith("/etc/kde/xdg/autostart"))
+       {
+           continue;
+       }
+       TDEDesktopFile config(*it, true);
        if (config.hasKey("X-TDE-autostart-condition")) {
            if (!startCondition(config.readEntry("X-TDE-autostart-condition")))
               continue;
        }
-       else {
-           if (!startCondition(config.readEntry("X-TDE-autostart-condition")))
+       else if (config.hasKey("X-KDE-autostart-condition")) {
+           if (!startCondition(config.readEntry("X-KDE-autostart-condition")))
               continue;
        }
        if (!config.tryExec())
@@ -147,14 +150,14 @@ AutoStart::loadAutoStartList()
                // Same local file name?
                TQString localOuter;
                TQString localInner;
-               int slashPos = (*it).findRev( '/', -1, TRUE );
+               int slashPos = (*it).findRev( '/', -1, true );
                if (slashPos == -1) {
                    localOuter = (*it);
                }
                else {
                    localOuter = (*it).mid(slashPos+1);
                }
-               slashPos = (*localit).findRev( '/', -1, TRUE );
+               slashPos = (*localit).findRev( '/', -1, true );
                if (slashPos == -1) {
                    localInner = (*localit);
                }
@@ -164,7 +167,7 @@ AutoStart::loadAutoStartList()
                if (localOuter == localInner) {
                    // Overridden!
                    // But is Hidden == True?
-                   KDesktopFile innerConfig(*localit, true);
+                   TDEDesktopFile innerConfig(*localit, true);
                    if (innerConfig.readBoolEntry("Hidden", false)) {
                        // Override confirmed; exit speedily without autostarting
                        autostartOverriddenAndDisabled = true;
@@ -178,23 +181,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")))
+           if (config.readListEntry("NotShowIn", ';').contains("TDE") ||
+               config.readListEntry("NotShowIn", ';').contains("KDE"))
                continue;
-#else
-           if (config.readListEntry("NotShowIn", ';').contains("TDE"))
-               continue;
-#endif
        }
 
        AutoStartItem *item = new AutoStartItem;
@@ -203,13 +197,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 +212,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;
        }