diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-15 21:18:46 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-15 21:18:46 +0000 |
| commit | 3b07f92513f03772805943cf9ee77921f7c8aafe (patch) | |
| tree | 40551727899bcf4d1f717058fb2f2ab2dbfc70b2 /libkonq | |
| parent | 6eb49d190a25e04bc155976a73cb047c7d5473a3 (diff) | |
| download | tdebase-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')
| -rw-r--r-- | libkonq/konq_operations.cc | 8 | ||||
| -rw-r--r-- | libkonq/konq_popupmenu.cc | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index 6c7a2ba81..6a1ebcdb6 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -417,7 +417,13 @@ void KonqOperations::asyncDrop( const KFileItem * destItem ) delete this; return; } - if ( destItem->mimetype() == "application/x-desktop") + if ( (destItem->mimetype() == "application/x-desktop") + || (destItem->mimetype() == "media/builtin-mydocuments") + || (destItem->mimetype() == "media/builtin-mycomputer") + || (destItem->mimetype() == "media/builtin-mynetworkplaces") + || (destItem->mimetype() == "media/builtin-printers") + || (destItem->mimetype() == "media/builtin-trash") + || (destItem->mimetype() == "media/builtin-webbrowser") ) { // Local .desktop file. What type ? KDesktopFile desktopFile( m_destURL.path() ); 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 ); |