[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/KDE/4.12] kio/kio: Do not blindly overwrite the content of the clipboard on KIO move operat
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2014-03-23 16:24:33
Message-ID: E1WRlCL-0002N9-I7 () scm ! kde ! org
[Download RAW message or body]

Git commit 3e22d6c90d43989a06aed3b0bfb5ac7e6d606311 by Dawit Alemayehu.
Committed on 23/03/2014 at 16:17.
Pushed by adawit into branch 'KDE/4.12'.

Do not blindly overwrite the content of the clipboard on KIO move operations.

BUG: 332328
FIXED-IN: 4.12.4

M  +2    -7    kio/kio/paste.cpp

http://commits.kde.org/kdelibs/3e22d6c90d43989a06aed3b0bfb5ac7e6d606311

diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp
index 5a588af..8ae1a9a 100644
--- a/kio/kio/paste.cpp
+++ b/kio/kio/paste.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "paste.h"
-#include "clipboardupdater_p.h"
 #include "pastedialog.h"
 
 #include "kio/job.h"
@@ -68,13 +67,9 @@ static KIO::Job *pasteClipboardUrls(const QMimeData* mimeData, const KUrl& destD
         KIO::Job *job = 0;
         if (move) {
             job = KIO::move(urls, destDir, flags);
-            KIO::ClipboardUpdater* clipboardUpdater = job->findChild<KIO::ClipboardUpdater *>();
-            if (clipboardUpdater) {
-                clipboardUpdater->setMode(KIO::ClipboardUpdater::OverwriteContent);
-            }
-        }
-        else
+        } else {
             job = KIO::copy(urls, destDir, flags);
+        }
         return job;
     }
     return 0;
[prev in list] [next in list] [prev in thread] [next in thread]