> On Nov. 10, 2012, 9:36 p.m., David Faure wrote: > > kioslave/trash/kio_trash.cpp, line 277 > > <http://git.reviewboard.kde.org/r/105078/diff/1/?file=65712#file65712line277> > > > > Sorry for the time it took me to review this proposed change. > > > > It turns out that this change breaks the displaying of files in > > subdirs, as detected by the unittest TestTrash::statFileInDirectory(). > > > > The URL trash:/0-trashDirFromHome/testfile now shows up with a text of > > "trashDirFromHome" instead of "testfile". > > > > Yay for unittests preventing regressions :-) > > > > Also, I think that listDir and stat should always provide the same > > display name, in the UDS entry for the same URL. > > > > Do you have time to dig further into this? From a quick look I guess > > that extracting the file name from "relativePath" instead of from > > "filePath" might do the job here.
A quick test revealed that relativePath can indead be used in the stat function with the same effect. Three unit tests fail with this change. I'll try and look further tomarrow. - Michael ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/105078/#review21782 ----------------------------------------------------------- On June 18, 2012, 5:39 p.m., Michael Reeves wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/105078/ > ----------------------------------------------------------- > > (Updated June 18, 2012, 5:39 p.m.) > > > Review request for KDE Runtime. > > > Description > ------- > > This patch makes drag-and-drop and cut/paste from trash preserve the orginal > filename instead of appending "0-". > > > This addresses bug 183403. > http://bugs.kde.org/show_bug.cgi?id=183403 > > > Diffs > ----- > > kioslave/trash/kio_trash.cpp 4187f45 > kioslave/trash/trash.protocol f96d4a1 > > Diff: http://git.reviewboard.kde.org/r/105078/diff/ > > > Testing > ------- > > I have used the modified io_trash module on my machine since before the KDE > 4.8 release and still use it under KDE 4.8.3. > > > Thanks, > > Michael Reeves > >
