stop the emission of the signal also when we bail out early because we

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.

svn path=/trunk/; revision=21302

diff --git a/ChangeLog b/ChangeLog
index ff0585fbe9210b6c4dc2c26472acdf75c68bbfc6..a693df95db1cacc49fcfe372fc6888bb9756ec65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2008-09-05  Tor Lillqvist  <tml@novell.com>
 
        * gtk-zip.sh.in: Fetch manpages from share/man where they get

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 71eadcf7a39d1cdaae1adc9ff963e4ba135593af..5f5b849d020edc2167436aa07a1249fe983d4403 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4197,10 +4197,13 @@ file_list_drag_data_received_cb (GtkWidget          *widget,
 
   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);