[Pkg-owncloud-commits] [owncloud-client] 36/171: Systray: Use the original name for the rename notification #4295

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 48a0ffdc9e5ff046efe394a64b5e0954ac61727b
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Dec 21 11:06:39 2015 +0100

    Systray: Use the original name for the rename notification #4295
    
    Otherwise it shows twice as "newname was renamed to newname".
    Because _file is set to the new name in PropagateLocalRename::start
---
 src/gui/folder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index d15efbf..2946d19 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -488,7 +488,7 @@ void Folder::bubbleUpSyncResult()
         if(renTarget != renSource) {
             status.set(SyncFileStatus::STATUS_MOVE);
         }
-        createGuiLog( firstItemRenamed->_file, status, renamedItems, firstItemRenamed->_renameTarget );
+        createGuiLog( firstItemRenamed->_originalFile, status, renamedItems, firstItemRenamed->_renameTarget );
     }
 
     createGuiLog( firstItemError->_file,   SyncFileStatus::STATUS_ERROR, errorItems );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git