From cea780b85ba32d0a91c3ff8fdeebd34a2f9e7868 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Wed, 28 Sep 2011 00:04:48 +0200
Subject: [PATCH] * Fixed moving tracks within a playlist.

---
 src/libtomahawk/dropjob.cpp                | 5 +++++
 src/libtomahawk/playlist/playlistmodel.cpp | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/libtomahawk/dropjob.cpp b/src/libtomahawk/dropjob.cpp
index a9de8ba73..cbf48c4b2 100644
--- a/src/libtomahawk/dropjob.cpp
+++ b/src/libtomahawk/dropjob.cpp
@@ -39,6 +39,10 @@ DropJob::DropJob( QObject *parent )
     : QObject( parent )
     , m_queryCount( 0 )
     , m_dropAction( Default )
+    , m_onlyLocal( false )
+    , m_getWholeArtists( false )
+    , m_getWholeAlbums( false )
+    , m_top10( false )
 {
 }
 
@@ -61,6 +65,7 @@ DropJob::mimeTypes()
               << "application/tomahawk.metadata.album"
               << "application/tomahawk.mixed"
               << "text/plain";
+
     return mimeTypes;
 }
 
diff --git a/src/libtomahawk/playlist/playlistmodel.cpp b/src/libtomahawk/playlist/playlistmodel.cpp
index 6904d6962..7b3cb9ef2 100644
--- a/src/libtomahawk/playlist/playlistmodel.cpp
+++ b/src/libtomahawk/playlist/playlistmodel.cpp
@@ -365,8 +365,10 @@ PlaylistModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int r
     m_dropStorage.row = row;
     m_dropStorage.parent = QPersistentModelIndex( parent );
     m_dropStorage.action = action;
-    DropJob *dj = new DropJob();
-    dj->setDropAction( DropJob::Append );
+
+    DropJob* dj = new DropJob();
+    if ( action & Qt::CopyAction )
+        dj->setDropAction( DropJob::Append );
 
     connect( dj, SIGNAL( tracks( QList< Tomahawk::query_ptr > ) ), this, SLOT( parsedDroppedTracks( QList< Tomahawk::query_ptr > ) ) );
     dj->tracksFromMimeData( data );