summaryrefslogtreecommitdiffstats
path: root/libkonq/konq_popupmenu.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-15 21:18:46 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-15 21:18:46 +0000
commit3b07f92513f03772805943cf9ee77921f7c8aafe (patch)
tree40551727899bcf4d1f717058fb2f2ab2dbfc70b2 /libkonq/konq_popupmenu.cc
parent6eb49d190a25e04bc155976a73cb047c7d5473a3 (diff)
downloadtdebase-3b07f92513f03772805943cf9ee77921f7c8aafe.tar.gz
tdebase-3b07f92513f03772805943cf9ee77921f7c8aafe.zip
Part 2/2 of prior commit
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1175772 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkonq/konq_popupmenu.cc')
-rw-r--r--libkonq/konq_popupmenu.cc16
1 files changed, 14 insertions, 2 deletions
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 4adfbc01d..044bda9d2 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -424,7 +424,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
//kdDebug(1203) << "View path is " << url.url() << endl;
//kdDebug(1203) << "First popup path is " << firstPopupURL.url() << endl;
currentDir = firstPopupURL.equals( url, true /* ignore_trailing */ );
- if ( isLocal && m_sMimeType == "application/x-desktop" ) {
+ if ( isLocal && ((m_sMimeType == "application/x-desktop")
+ || (m_sMimeType == "media/builtin-mydocuments")
+ || (m_sMimeType == "media/builtin-mycomputer")
+ || (m_sMimeType == "media/builtin-mynetworkplaces")
+ || (m_sMimeType == "media/builtin-printers")
+ || (m_sMimeType == "media/builtin-trash")
+ || (m_sMimeType == "media/builtin-webbrowser")) ) {
KSimpleConfig cfg( firstPopupURL.path(), true );
cfg.setDesktopGroup();
isTrashLink = ( cfg.readEntry("Type") == "Link" && cfg.readEntry("URL") == "trash:/" );
@@ -629,7 +635,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
// 1 - Look for builtin and user-defined services
- if ( m_sMimeType == "application/x-desktop" && isSingleLocal ) // .desktop file
+ if ( ((m_sMimeType == "application/x-desktop")
+ || (m_sMimeType == "media/builtin-mydocuments")
+ || (m_sMimeType == "media/builtin-mycomputer")
+ || (m_sMimeType == "media/builtin-mynetworkplaces")
+ || (m_sMimeType == "media/builtin-printers")
+ || (m_sMimeType == "media/builtin-trash")
+ || (m_sMimeType == "media/builtin-webbrowser")) && isSingleLocal ) // .desktop file
{
// get builtin services, like mount/unmount
s.builtin = KDEDesktopMimeType::builtinServices( urlForServiceMenu );