summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-24 17:37:17 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-24 17:37:17 +0000
commite975b7cec7cd941ccaa01494f98df7c571ab18f7 (patch)
treeedaa46319fb6d66b3c570199236524c64a859435 /kdesktop
parent0dfb53e20e286167d0d38a347ee8911033d43fbb (diff)
downloadtdebase-e975b7cec7cd941ccaa01494f98df7c571ab18f7.tar.gz
tdebase-e975b7cec7cd941ccaa01494f98df7c571ab18f7.zip
* 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
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/kdiconview.cc30
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;
}
}