From 1d098a40b883e50996d29f5e7614197ee39faaa5 Mon Sep 17 00:00:00 2001
From: David Sansome <me@davidsansome.com>
Date: Sat, 27 Aug 2011 23:54:55 +0100
Subject: [PATCH] Revert commit ddfb90a0a194d6b9acce20da555fab2cfa898171, and
 always delete files from disk rather than sending them to trash.

---
 src/core/filesystemmusicstorage.cpp | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/core/filesystemmusicstorage.cpp b/src/core/filesystemmusicstorage.cpp
index cb04f089a..927048065 100644
--- a/src/core/filesystemmusicstorage.cpp
+++ b/src/core/filesystemmusicstorage.cpp
@@ -15,20 +15,9 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "config.h"
+#include "filesystemmusicstorage.h"
 #include "core/logging.h"
 
-#ifdef HAVE_GIO
-  // Work around compile issue with glib >= 2.25
-  #ifdef signals
-    #undef signals
-  #endif
-
-  #include <gio/gio.h>
-#endif
-
-#include "filesystemmusicstorage.h"
-#include <QByteArray>
 #include <QDir>
 #include <QFile>
 
@@ -64,16 +53,5 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob& job) {
 }
 
 bool FilesystemMusicStorage::DeleteFromStorage(const DeleteJob& job) {
-#ifdef HAVE_GIO
-  //convert QString to char
-  QByteArray ba = job.metadata_.url().toLocalFile().toLocal8Bit();
-  const char *filepathChar = ba.data();
-  GFile *file = g_file_new_for_path (filepathChar);
-  bool success = g_file_trash(file, NULL, NULL);
-  g_object_unref(file);
-  return success;
-#else
   return QFile::remove(job.metadata_.url().toLocalFile());
-#endif
 }
-