From: David Faure <faure@kde.org>
Date: Tue, 2 Dec 2008 13:31:55 +0000 (+0000)
Subject: interop fix: don't give an empty mostLocalUrls list
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/0577164fbd3aa161eaf323fad02ac12d7b0a1ae9

interop fix: don't give an empty mostLocalUrls list

svn path=/trunk/KDE/kdebase/apps/; revision=891613
---

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index 20840060e..9e8638002 100644
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -85,7 +85,7 @@ void TreeViewContextMenu::open()
         KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
         KConfigGroup configGroup(globalConfig, "KDE");
         bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
-        
+
         const KUrl& url = m_fileInfo.url();
         if (url.isLocalFile()) {
             QAction* moveToTrashAction = new QAction(KIcon("user-trash"),
@@ -126,21 +126,27 @@ void TreeViewContextMenu::open()
     popup->deleteLater();
 }
 
-void TreeViewContextMenu::cut()
+void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
 {
-    QMimeData* mimeData = new QMimeData();
     KUrl::List kdeUrls;
     kdeUrls.append(m_fileInfo.url());
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), true);
+    KUrl::List mostLocalUrls;
+    bool dummy;
+    mostLocalUrls.append(m_fileInfo.mostLocalUrl(dummy));
+    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, cut);
+}
+
+void TreeViewContextMenu::cut()
+{
+    QMimeData* mimeData = new QMimeData();
+    populateMimeData(mimeData, true);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
 void TreeViewContextMenu::copy()
 {
     QMimeData* mimeData = new QMimeData();
-    KUrl::List kdeUrls;
-    kdeUrls.append(m_fileInfo.url());
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), false);
+    populateMimeData(mimeData, false);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
diff --git a/src/treeviewcontextmenu.h b/src/treeviewcontextmenu.h
index ec6170bf2..20a603573 100644
--- a/src/treeviewcontextmenu.h
+++ b/src/treeviewcontextmenu.h
@@ -77,6 +77,9 @@ private slots:
      */
     void setShowHiddenFiles(bool show);
 
+private:
+    void populateMimeData(QMimeData* mimeData, bool cut);
+
 private:
     TreeViewSidebarPage* m_parent;
     KFileItem m_fileInfo;