[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/konqueror/sidebar
From:       Marcus Camen <mcamen () mcamen ! de>
Date:       2004-07-20 13:50:16
Message-ID: 20040720135016.7B2319A08 () office ! kde ! org
[Download RAW message or body]

CVS commit by mcamen: 

* use KDesktopFile instead of KSimpleConfig
* check for tryExec=foo in a sidebar whatever_add.desktop file

http://lists.kde.org/?t=109026213600001


  M +9 -4      sidebar_widget.cpp   1.129


--- kdebase/konqueror/sidebar/sidebar_widget.cpp  #1.128:1.129
@@ -43,4 +43,5 @@
 #include <kinputdialog.h>
 #include <kfiledialog.h>
+#include <kdesktopfile.h>
 #include "konqsidebar.h"
 
@@ -76,8 +77,12 @@ void addBackEnd::aboutToShowAddMenu()
         for (QStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ )
         {
-                KSimpleConfig *confFile;
+                KDesktopFile *confFile;
 
-                confFile = new KSimpleConfig(*it, true);
-                confFile->setGroup("Desktop Entry");
+                confFile = new KDesktopFile(*it, true);
+                if (! confFile->tryExec()) {
+                        delete confFile;
+                        i--;
+                        continue;
+                }
                 if (m_universal) {
                         if (confFile->readEntry("X-KDE-KonqSidebarUniversal").upper()!="TRUE") {
@@ -93,5 +98,5 @@ void addBackEnd::aboutToShowAddMenu()
                         }
                 }
-                QString icon = confFile->readEntry("Icon");
+                QString icon = confFile->readIcon();
                 if (!icon.isEmpty())
                 {


[prev in list] [next in list] [prev in thread] [next in thread]