gtk+ r21302 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Fri Sep  5 19:53:30 2008
New Revision: 21302
URL: http://svn.gnome.org/viewvc/gtk+?rev=21302&view=rev

Log:
2008-09-05  Michael Natterer  <mitch imendio com>

	* gtk/gtkfilechooserdefault.c (file_list_drag_data_received_cb):
	stop the emission of the signal also when we bail out early
	because we don't accept drops from ourselves. Keeps the code from
	running into a warning in gtktreeview.c.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfilechooserdefault.c

Modified: trunk/gtk/gtkfilechooserdefault.c
==============================================================================
--- trunk/gtk/gtkfilechooserdefault.c	(original)
+++ trunk/gtk/gtkfilechooserdefault.c	Fri Sep  5 19:53:30 2008
@@ -4197,10 +4197,13 @@
 
   impl = GTK_FILE_CHOOSER_DEFAULT (data);
   chooser = GTK_FILE_CHOOSER (data);
-  
+
   /* Allow only drags from other widgets; see bug #533891. */
   if (gtk_drag_get_source_widget (context) == widget)
-    return;
+    {
+      g_signal_stop_emission_by_name (widget, "drag-data-received");
+      return;
+    }
 
   /* Parse the text/uri-list string, navigate to the first one */
   uris = gtk_selection_data_get_uris (selection_data);