[totem] Bug 588937 – Drag and drop on itself with Alt appends instead of asking

[Robin Stocker <robinst src gnome org>]

commit 7c34a2a8b84c55537c01183dea6f8eabedcb42d0
Author: Robin Stocker <robin nibor org>
Date:   Sun Jul 26 19:43:03 2009 +0200

    Bug 588937 â?? Drag and drop on itself with Alt appends instead of asking
    
    Applied commit f53e438e0e530e5cbbd7ed607df498310645013d again after it
    was accidentally reverted in cce286bf32d4b800000aa9f731adbd8574ca5339.

 src/totem-object.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index 1c74149..4de299f 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -2217,7 +2217,14 @@ drop_video_cb (GtkWidget     *widget,
 {
 	gboolean empty_pl;
 
-	if (context->suggested_action == GDK_ACTION_ASK) {
+	/* Drop of video on itself */
+	if (context->source_window == totem->video_drag_source_window &&
+	    context->action == GDK_ACTION_MOVE) {
+		gtk_drag_finish (context, FALSE, FALSE, _time);
+		return;
+	}
+
+	if (context->action == GDK_ACTION_ASK) {
 		context->action = totem_drag_ask (totem_get_playlist_length (totem) > 0);
 	}
 
@@ -2227,13 +2234,6 @@ drop_video_cb (GtkWidget     *widget,
 		return;
 	}
 
-	/* Drop of video on itself */
-	if (context->source_window == totem->video_drag_source_window &&
-	    context->action == GDK_ACTION_MOVE) {
-		gtk_drag_finish (context, FALSE, FALSE, _time);
-		return;
-	}
-
 	empty_pl = (context->action == GDK_ACTION_MOVE);
 	totem_action_drop_files (totem, data, info, empty_pl);
 	gtk_drag_finish (context, TRUE, FALSE, _time);
@@ -2272,7 +2272,7 @@ drop_playlist_cb (GtkWidget     *widget,
 {
 	gboolean empty_pl;
 
-	if (context->suggested_action == GDK_ACTION_ASK)
+	if (context->action == GDK_ACTION_ASK)
 		context->action = totem_drag_ask (totem_get_playlist_length (totem) > 0);
 
 	if (context->action == GDK_ACTION_DEFAULT) {