Review Request 114228: Fix Bug 328262 - rename bug if you cancel when folder already exists

[Emmanuel Pescosta]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/114228/
-----------------------------------------------------------

(Updated Dec. 3, 2013, 1:33 p.m.)


Review request for Dolphin and David Faure.


Changes
-------

If the user has cancelled the renaming job, no real renaming was performed and so
the item still has the old url in the model.

So we use the old url in this special case and the new url in all other cases to update the item text.

@David:
* Added "int error" to KonqOperations::renamingFailed and hand over the renamingJob->error()


Bugs: 328262
    http://bugs.kde.org/show_bug.cgi?id=328262


Repository: kde-baseapps


Description
-------

Use the old instead of the new item url to update the item text in the model.

Only the item text is temporarily renamed, the url is still the old one
until the item was successfully renamed by KIO. So we must use the old url
to access the right item.


Diffs (updated)
-----

  dolphin/src/views/dolphinview.h 86bc5c1 
  dolphin/src/views/dolphinview.cpp 20bc9f5 
  lib/konq/konq_operations.h e9255c4 
  lib/konq/konq_operations.cpp bd96f39 

Diff: http://git.reviewboard.kde.org/r/114228/diff/


Testing
-------

1. Creat Folder 1 "Bar" 
2. Create Folder 2 "Foo" 
3. Rename Folder 2 into "Foo" and press Enter 
4. Cancel the question 
5. Folder 1 is still "Bar" and folder 2 is still "Foo"

Works for me.


Thanks,

Emmanuel Pescosta

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.kde.org/mailman/private/kfm-devel/attachments/20131203/ae484929/attachment.htm>