* Allow XDG launcher to directly rewrite the XDG configuration file instead of going through a third party application

* Fix desktop icon builtin detection
* Desktop icon removal is now more intuitive


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

1 files changed, 7 insertions, 0 deletions

diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 73b493120..4e2841588 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -24,6 +24,7 @@
 #include <kaction.h>
 #include <kfileitem.h>
 #include <kdirnotify.h>
+#include <kmessagebox.h>
 
 class KDirLister;
 class KonqSettings;
@@ -173,6 +174,9 @@ protected:
     void moveToFreePosition(TQIconViewItem *item );
 
     bool deleteGlobalDesktopFiles();
+    void removeBuiltinIcon(TQString iconName);
+    void fillMediaListView();
+    void saveMediaListView();
 
     static void renameDesktopFile(const TQString &path, const TQString &name);
 
@@ -260,6 +264,9 @@ private:
     bool m_gotIconsArea;
 
     bool m_needDesktopAlign;
+
+    TQListView *mMediaListView;
+    KConfig *g_pConfig;
 };
 
 #endif