gtk+ r20151 - in trunk: . gtk

[rhult svn gnome org]

Author: rhult
Date: Sun May 25 15:11:11 2008
New Revision: 20151
URL: http://svn.gnome.org/viewvc/gtk+?rev=20151&view=rev

Log:
2008-05-25  Richard Hult  <richard imendio com>

	* gtk/gtkdnd-quartz.c: (gtk_drag_drop_finished): Run
	gtk_drag_source_info_destroy in an idle, workaround for bug
	#501588, that makes any code that uses the context returned from
	gtk_drag_begin() crash, like treeview/iconview dnd.
	(GdkDragSourceOwner::provideDataForType): only use the data if we
	got any.


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkdnd-quartz.c

Modified: trunk/gtk/gtkdnd-quartz.c
==============================================================================
--- trunk/gtk/gtkdnd-quartz.c	(original)
+++ trunk/gtk/gtkdnd-quartz.c	Sun May 25 15:11:11 2008
@@ -143,6 +143,7 @@
 
   selection_data.selection = GDK_NONE;
   selection_data.data = NULL;
+  selection_data.length = -1;
   selection_data.target = _gtk_quartz_pasteboard_type_to_atom (type);
 
   if (gtk_target_list_find (info->target_list, 
@@ -155,7 +156,8 @@
 			     target_info,
 			     time);
 
-      _gtk_quartz_set_selection_data_for_pasteboard (sender, &selection_data);
+      if (selection_data.length >= 0)
+        _gtk_quartz_set_selection_data_for_pasteboard (sender, &selection_data);
       
       g_free (selection_data.data);
     }
@@ -1769,10 +1771,21 @@
   g_free (info);
 }
 
+static gboolean
+drag_drop_finished_idle_cb (gpointer data)
+{
+  gtk_drag_source_info_destroy (data);
+  return FALSE;
+}
+
 static void
 gtk_drag_drop_finished (GtkDragSourceInfo *info)
 {
-  gtk_drag_source_info_destroy (info);
+  /* Workaround for the fact that the NS API blocks until the drag is
+   * over. This way the context is still valid when returning from
+   * drag_begin, even if it will still be quite useless. See bug #501588.
+  */
+  g_idle_add (drag_drop_finished_idle_cb, info);
 }
 
 /*************************************************************