need to disconnect from signals connected in gtk_drag_dest_set() here.

2006-08-07  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkdnd-quartz.c (gtk_drag_dest_unset): need to disconnect
	from signals connected in gtk_drag_dest_set() here.

	* gtk/gtkdnd-quartz.c (gtk_drag_dest_set): call gtk_drag_dest_unset()
	instead of disconnecting the old signal connections here.

diff --git a/ChangeLog b/ChangeLog
index 2d847b49a390dae00e99a35a82b14c347f6bac19..0d0391d99f2882161dcda8b679849a2d1dcedec0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-07  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkdnd-quartz.c (gtk_drag_dest_unset): need to disconnect
+       from signals connected in gtk_drag_dest_set() here.
+
+       * gtk/gtkdnd-quartz.c (gtk_drag_dest_set): call gtk_drag_dest_unset()
+       instead of disconnecting the old signal connections here.
+
 2006-08-07  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentchooserdefault.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2d847b49a390dae00e99a35a82b14c347f6bac19..0d0391d99f2882161dcda8b679849a2d1dcedec0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-08-07  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkdnd-quartz.c (gtk_drag_dest_unset): need to disconnect
+       from signals connected in gtk_drag_dest_set() here.
+
+       * gtk/gtkdnd-quartz.c (gtk_drag_dest_set): call gtk_drag_dest_unset()
+       instead of disconnecting the old signal connections here.
+
 2006-08-07  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentchooserdefault.c:

diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 811b48b183738a7d7785bcae69aa4756ebca1f0f..6c0e55e8d39b62dc1d97f52e5dd95dc7114574ea 100644 (file)
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -462,20 +462,11 @@ gtk_drag_dest_set (GtkWidget            *widget,
                   gint                  n_targets,
                   GdkDragAction         actions)
 {
-  GtkDragDestSite *old_site, *site;
+  GtkDragDestSite *site;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  old_site = g_object_get_data (G_OBJECT (widget), "gtk-drag-dest");
-  if (old_site)
-    {
-      g_signal_handlers_disconnect_by_func (widget,
-                                           gtk_drag_dest_realized,
-                                           old_site);
-      g_signal_handlers_disconnect_by_func (widget,
-                                           gtk_drag_dest_hierarchy_changed,
-                                           old_site);
-    }
+  gtk_drag_dest_unset (widget);
 
   site = g_new (GtkDragDestSite, 1);
   site->flags = flags;
@@ -510,8 +501,21 @@ gtk_drag_dest_set_proxy (GtkWidget      *widget,
 void 
 gtk_drag_dest_unset (GtkWidget *widget)
 {
+  GtkDragDestSite *old_site;
+
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
+  old_site = g_object_get_data (G_OBJECT (widget), "gtk-drag-dest");
+  if (old_site)
+    {
+      g_signal_handlers_disconnect_by_func (widget,
+                                            gtk_drag_dest_realized,
+                                            old_site);
+      g_signal_handlers_disconnect_by_func (widget,
+                                            gtk_drag_dest_hierarchy_changed,
+                                            old_site);
+    }
+
   g_object_set_data (G_OBJECT (widget), I_("gtk-drag-dest"), NULL);
 }