gimp r25321 - in branches/gimp-2-4: . app/widgets

[martinn svn gnome org]

Author: martinn
Date: Sun Mar 30 19:38:52 2008
New Revision: 25321
URL: http://svn.gnome.org/viewvc/gimp?rev=25321&view=rev

Log:
2008-03-30  Martin Nordholts  <martinn svn gnome org>

	Merged from trunk:

	* app/widgets/gimpcontainertreeview-dnd.c
	(gimp_container_tree_view_drag_drop): Make all code paths result
	in a call to gtk_drag_finish() if we return TRUE. Fixes bug
	#317992.


Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/app/widgets/gimpcontainertreeview-dnd.c

Modified: branches/gimp-2-4/app/widgets/gimpcontainertreeview-dnd.c
==============================================================================
--- branches/gimp-2-4/app/widgets/gimpcontainertreeview-dnd.c	(original)
+++ branches/gimp-2-4/app/widgets/gimpcontainertreeview-dnd.c	Sun Mar 30 19:38:52 2008
@@ -314,10 +314,18 @@
       tree_view_class = GIMP_CONTAINER_TREE_VIEW_GET_CLASS (tree_view);
 
       if (src_viewable)
-        tree_view_class->drop_viewable (tree_view, src_viewable,
-                                        dest_viewable, drop_pos);
+        {
+          gboolean success = TRUE;
+
+          tree_view_class->drop_viewable (tree_view, src_viewable,
+                                          dest_viewable, drop_pos);
+
+          gtk_drag_finish (context, success, FALSE, time);
+        }
       else
-        gtk_drag_get_data (widget, context, target, time);
+        {
+          gtk_drag_get_data (widget, context, target, time);
+        }
 
       return TRUE;
     }