summaryrefslogtreecommitdiffstats
path: root/kded
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-15 21:18:13 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-15 21:18:13 +0000
commit70331186c82001a2652bf40e01d49dc8a8ac3a4b (patch)
tree96693c5fe634e0d5cbc8739724aaab9cabd9a4bd /kded
parent1c6affb83d6058a92f13e458abc3b5cec26c97ef (diff)
downloadtdelibs-70331186c82001a2652bf40e01d49dc8a8ac3a4b.tar.gz
tdelibs-70331186c82001a2652bf40e01d49dc8a8ac3a4b.zip
Commit 1/2 of new (and optional!) builtin desktop icons
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1175771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kded')
-rw-r--r--kded/kbuildservicetypefactory.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index 4861c3fba..b5259c5cd 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -98,7 +98,13 @@ KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource
KServiceType* e;
if ( mime == "inode/directory" )
e = new KFolderType( &desktopFile );
- else if ( mime == "application/x-desktop" )
+ else if ( (mime == "application/x-desktop")
+ || (mime == "media/builtin-mydocuments")
+ || (mime == "media/builtin-mycomputer")
+ || (mime == "media/builtin-mynetworkplaces")
+ || (mime == "media/builtin-printers")
+ || (mime == "media/builtin-trash")
+ || (mime == "media/builtin-webbrowser") )
e = new KDEDesktopMimeType( &desktopFile );
else if ( mime == "application/x-executable" || mime == "application/x-shellscript" )
e = new KExecMimeType( &desktopFile );
@@ -250,7 +256,7 @@ KBuildServiceTypeFactory::addEntry(KSycocaEntry *newEntry, const char *resource)
// Already exists
if (serviceType->desktopEntryPath().endsWith("kdelnk"))
return; // Skip
-
+
// Replace
KSycocaFactory::removeEntry(newEntry);
}