* Generic builtin icons now supported

* Final fixups to builtin desktop icon configuration


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

1 files changed, 2 insertions, 28 deletions

diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index ed0500e1c..0dce92ba3 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -842,34 +842,8 @@ bool KDIconView::deleteGlobalDesktopFiles()
         if ( isDesktopFile(fItem) ) {
             KSimpleConfig cfg( fItem->url().path(), true );
             cfg.setDesktopGroup();
-            if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" &&
-                 cfg.readEntry( "Name" ) == "My Documents" ) {
-                removeBuiltinIcon("My Documents");
-                continue;
-            }
-            if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" &&
-                 cfg.readEntry( "Name" ) == "My Computer" ) {
-                removeBuiltinIcon("My Computer");
-                continue;
-            }
-            if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" &&
-                 cfg.readEntry( "Name" ) == "My Network Places" ) {
-                removeBuiltinIcon("My Network Places");
-                continue;
-            }
-            if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" &&
-                 cfg.readEntry( "Name" ) == "Printers" ) {
-                removeBuiltinIcon("Printers");
-                continue;
-            }
-            if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" &&
-                 cfg.readEntry( "Name" ) == "Trash" ) {
-                removeBuiltinIcon("Trash");
-                continue;
-            }
-            if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" &&
-                 cfg.readEntry( "Name" ) == "Web Browser" ) {
-                removeBuiltinIcon("Web Browser");
+            if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" ) {
+                removeBuiltinIcon(cfg.readEntry( "Name" ));
                 continue;
             }
         }