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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs/KDE/4=2E6=5D_kio/kio=3A_Properly_rename_a_f?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-05-09 3:23:50
Message-ID: 20110509032350.7AE13A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 76e53125d22db9151c345fa1d3e3b467eab512af by Dawit Alemayehu.
Committed on 09/05/2011 at 05:10.
Pushed by adawit into branch 'KDE/4.6'.

Properly rename a file when it conflicts with an existing file during a move
operation. Fixes the remaining issue in bug# 256650.

BUG: 256650
FIXED-IN: 4.6.4

M  +1    -0    kio/kio/copyjob.cpp     

http://commits.kde.org/kdelibs/76e53125d22db9151c345fa1d3e3b467eab512af

diff --git a/kio/kio/copyjob.cpp b/kio/kio/copyjob.cpp
index a2c74e6..c792846 100644
--- a/kio/kio/copyjob.cpp
+++ b/kio/kio/copyjob.cpp
@@ -1861,6 +1861,7 @@ void CopyJobPrivate::slotResultRenaming( KJob* job )
                 destDirectory.setPath(destDirectory.directory());
                 const QString newName = \
KIO::RenameDialog::suggestName(destDirectory, m_currentDestURL.fileName());  
+                m_dest.setPath(m_currentDestURL.path());
                 m_dest.setFileName(newName);
                 KIO::Job* job = KIO::stat(m_dest, StatJob::DestinationSide, 2, \
KIO::HideProgressInfo);  state = STATE_STATING;


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