totem r5843 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Wed Dec 10 18:37:46 2008
New Revision: 5843
URL: http://svn.gnome.org/viewvc/totem?rev=5843&view=rev

Log:
2008-12-10  Bastien Nocera  <hadess hadess net>

	* src/totem-dnd-menu.c (drag_menu_deactivate_callback),
	(totem_drag_ask):
	* src/totem-playlist.c (drop_cb):
	* src/totem.c (drop_video_cb), (drop_playlist_cb): Use
	GDK_ACTION_DEFAULT instead of 0 for the cancelled drops,
	as pointed out by Robin Stocker <robin nibor org>



Modified:
   trunk/ChangeLog
   trunk/src/totem-dnd-menu.c
   trunk/src/totem-playlist.c
   trunk/src/totem.c

Modified: trunk/src/totem-dnd-menu.c
==============================================================================
--- trunk/src/totem-dnd-menu.c	(original)
+++ trunk/src/totem-dnd-menu.c	Wed Dec 10 18:37:46 2008
@@ -38,7 +38,7 @@
 drag_menu_deactivate_callback (GtkWidget *menu,
 			       DragData *dt)
 {
-	dt->ch = 0;
+	dt->ch = GDK_ACTION_DEFAULT;
 	if (g_main_loop_is_running (dt->loop))
 		g_main_loop_quit (dt->loop);
 }
@@ -100,7 +100,7 @@
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 	gtk_widget_show (menu_item);
 
-	drag_append_drop_action_menu_item (menu, _("Cancel"), NULL, 0, &dt);
+	drag_append_drop_action_menu_item (menu, _("Cancel"), NULL, GDK_ACTION_DEFAULT, &dt);
 
 	g_signal_connect (menu, "deactivate",
 			  G_CALLBACK (drag_menu_deactivate_callback), &dt);

Modified: trunk/src/totem-playlist.c
==============================================================================
--- trunk/src/totem-playlist.c	(original)
+++ trunk/src/totem-playlist.c	Wed Dec 10 18:37:46 2008
@@ -392,7 +392,7 @@
 
 	if (context->suggested_action == GDK_ACTION_ASK) {
 		context->action = totem_drag_ask (PL_LEN != 0);
-		if (context->action == 0) {
+		if (context->action == GDK_ACTION_DEFAULT) {
 			gtk_drag_finish (context, FALSE, FALSE, time);
 			return;
 		}

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Wed Dec 10 18:37:46 2008
@@ -1593,7 +1593,7 @@
 	if (context->suggested_action == GDK_ACTION_ASK)
 		context->action = totem_drag_ask (totem_get_playlist_length (totem) > 0);
 
-	if (context->action != 0) {
+	if (context->action != GDK_ACTION_DEFAULT) {
 		empty_pl = (context->action == GDK_ACTION_MOVE);
 		totem_action_drop_files (totem, data, info, empty_pl);
 		gtk_drag_finish (context, TRUE, FALSE, time);
@@ -1637,7 +1637,7 @@
 	if (context->suggested_action == GDK_ACTION_ASK)
 		context->action = totem_drag_ask (totem_get_playlist_length (totem) > 0);
 
-	if (context->action == 0) {
+	if (context->action == GDK_ACTION_DEFAULT) {
 		gtk_drag_finish (context, FALSE, FALSE, time);
 		return;
 	}