Honor local XDG autostart override through Hidden directive in desktop file

Closes bug 273


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1177236 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

kinit/autostart.cpp

@@ -130,14 +130,14 @@ AutoStart::loadAutoStartList()
        if (config.readBoolEntry("Hidden", false))
           continue;
 
-#if 0
        // Check to see if the most important ( usually ~/.config/autostart or ~/.kde3/Autostart) XDG directory
        // has overridden the Hidden directive and honor it if set to True
        bool autostartOverriddenAndDisabled = false;
-       for(TQStringList::ConstIterator localit = kdefiles.begin();
-           localit != kdefiles.end();
+       for(TQStringList::ConstIterator localit = files.begin();
+           localit != files.end();
            ++localit)
        {
+           if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localkdedir()) == true)) {
                // Same local file name?
                TQString localOuter;
                TQString localInner;
@@ -158,17 +158,17 @@ AutoStart::loadAutoStartList()
                if (localOuter == localInner) {
                    // Overridden!
                    // But is Hidden == True?
-               KDesktopFile innerConfig(*it, true);
+                   KDesktopFile innerConfig(*localit, true);
                    if (innerConfig.readBoolEntry("Hidden", false)) {
                        // Override confirmed; exit speedily without autostarting
                        autostartOverriddenAndDisabled = true;
                    }
                }
            }
+       }
 
        if (autostartOverriddenAndDisabled == true)
            continue;
-#endif
 
        if (config.hasKey("OnlyShowIn"))
        {