Commit f80d0384 authored by Michael Pyne's avatar Michael Pyne

Fix bug 90606 (Trashing files no longer works). I had been planning to use...

Fix bug 90606 (Trashing files no longer works).  I had been planning to use trash:/ anyways, but forgot to change it.

I am surprised, however, that code using KGlobalSettings::trashPath() will apparently no longer work for some people, perhaps it should be changed to return "trash:/" ?

CCMAIL:90606-done@bugs.kde.org

svn path=/trunk/kdemultimedia/juk/; revision=351049
parent 10009ea4
......@@ -26,6 +26,7 @@
#include <kglobalsettings.h>
#include <kurl.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <qheader.h>
#include <qcursor.h>
......@@ -754,8 +755,6 @@ void Playlist::removeFromDisk(const PlaylistItemList &items)
for(PlaylistItemList::ConstIterator it = items.begin(); it != items.end(); ++it)
files.append((*it)->file().absFilePath());
KURL trashDir = KGlobalSettings::trashPath();
DeleteDialog dialog(this);
if(dialog.confirmDeleteList(files)) {
bool shouldDelete = dialog.shouldDelete();
......@@ -765,7 +764,7 @@ void Playlist::removeFromDisk(const PlaylistItemList &items)
action("forward")->activate();
QString removePath = (*it)->file().absFilePath();
if((!shouldDelete && KIO::NetAccess::move(removePath, trashDir)) ||
if((!shouldDelete && KIO::NetAccess::synchronousRun(KIO::trash(removePath), this)) ||
(shouldDelete && QFile::remove(removePath))) {
if(!m_randomList.isEmpty() && !m_visibleChanged)
m_randomList.remove(*it);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment