File autostart-spec.diff of Package kdelibs3

Overview Repositories Revisions Requests Users Attributes Meta

File autostart-spec.diff of Package kdelibs3 (Revision 37b8bf3257cd28fbe682e2a83fb7a8f5)

Currently displaying revision 37b8bf3257cd28fbe682e2a83fb7a8f5 , Show latest

--- kdecore/kstandarddirs.cpp
+++ kdecore/kstandarddirs.cpp
@@ -100,7 +100,7 @@ static const char* const types[] = {"htm
 			      "wallpaper", "lib", "pixmap", "templates",
 			      "module", "qtplugins",
 			      "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu",
-			      "xdgdata-icon",
+			      "xdgdata-icon", "xdgconf-autostart",
 			      "kcfg", "emoticons", 0 };
 
 static int tokenize( QStringList& token, const QString& str,
@@ -1062,6 +1062,8 @@
         return "desktop-directories/";
     if (!strcmp(type, "xdgconf-menu"))
         return "menus/";
+    if (!strcmp(type, "xdgconf-autostart"))
+        return "autostart/";
     if (!strcmp(type, "kcfg"))
 	return "share/config.kcfg";
     if (!strcmp(type, "emoticons"))
--- kinit/autostart.cpp
+++ kinit/autostart.cpp
@@ -104,7 +104,9 @@
 void
 AutoStart::loadAutoStartList()
 {
-   QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
+   QStringList files = KGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true);
+   QStringList kdefiles = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
+   files += kdefiles;
    
    for(QStringList::ConstIterator it = files.begin();
        it != files.end();
@@ -118,6 +120,17 @@
        if (config.readBoolEntry("Hidden", false))
           continue;
        
+       if (config.hasKey("OnlyShowIn"))
+       {
+          if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
+              continue;
+       }
+       if (config.hasKey("NotShowIn"))
+       {
+           if (config.readListEntry("NotShowIn", ';').contains("KDE"))
+               continue;
+       }
+
        AutoStartItem *item = new AutoStartItem;
        item->name = extractName(*it);
        item->service = *it;

Places

File autostart-spec.diff of Package kdelibs3 (Revision 37b8bf3257cd28fbe682e2a83fb7a8f5)

Places