| dfaure |
| Frameworks |
In case of desktop:/ KIO which rewrites URLs, looking up the URL the trashed file got didn't work.
This resulted in trash:/filename being recorded by the undo manager which then failed to restore the file as it was actually trashed to e.g. trash:/0-filename
BUG: 391606
CHANGELOG: Undoing trashing files on the desktop has been fixed
I always looked in the wrong place, the undo manager code was all sane it was just that we tried to restore (using the direct rename shortcut) a file that didn't exist :(
Trashed a file on desktop:/, hit Ctrl+Z, file showed up again immediately.
| Lint Skipped |
| Unit Tests Skipped |
There's still something borked with it. It works once for a new file but when I undo, delete and undo again it breaks or sometimes still doesn't work at all. :(
This calls for unittests. UndoManager has unittests here in kio, but if this requires kio_desktop then the test needs to be where kio_desktop is.
| src/core/copyjob.cpp | ||
|---|---|---|
| 2095 | slook? | |
Ping, any update on this? @dfaure, could you lend a hand maybe, when you have some time?
My version is up at D23758
| src/core/copyjob.cpp | ||
|---|---|---|
| 2097 | Is this really the version of the fix that worked for you? It seems to me that the second arg needs to be m_currentSrcURL too, otherwise FileUndoManager tries to call KIO::rename("trash:/...", "desktop:/...") which isn't supported by the trash ioslave. | |