diff --git a/ChangeLog b/ChangeLog index 51776c0a2b..8d4cadb9ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 11 10:45:28 1999 Owen Taylor + + * gtk/gtkdnd.c: Only remove handlers for motion/button_release + at drop, remove "selection_get" handler later. + Mon Jan 11 13:31:49 1999 Tim Janik * gtk/gtktypeutils.[hc]: removed Paolo Molaro's type creation hooks diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 51776c0a2b..8d4cadb9ab 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Jan 11 10:45:28 1999 Owen Taylor + + * gtk/gtkdnd.c: Only remove handlers for motion/button_release + at drop, remove "selection_get" handler later. + Mon Jan 11 13:31:49 1999 Tim Janik * gtk/gtktypeutils.[hc]: removed Paolo Molaro's type creation hooks diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 51776c0a2b..8d4cadb9ab 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Jan 11 10:45:28 1999 Owen Taylor + + * gtk/gtkdnd.c: Only remove handlers for motion/button_release + at drop, remove "selection_get" handler later. + Mon Jan 11 13:31:49 1999 Tim Janik * gtk/gtktypeutils.[hc]: removed Paolo Molaro's type creation hooks diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 51776c0a2b..8d4cadb9ab 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Jan 11 10:45:28 1999 Owen Taylor + + * gtk/gtkdnd.c: Only remove handlers for motion/button_release + at drop, remove "selection_get" handler later. + Mon Jan 11 13:31:49 1999 Tim Janik * gtk/gtktypeutils.[hc]: removed Paolo Molaro's type creation hooks diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 51776c0a2b..8d4cadb9ab 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Jan 11 10:45:28 1999 Owen Taylor + + * gtk/gtkdnd.c: Only remove handlers for motion/button_release + at drop, remove "selection_get" handler later. + Mon Jan 11 13:31:49 1999 Tim Janik * gtk/gtktypeutils.[hc]: removed Paolo Molaro's type creation hooks diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 51776c0a2b..8d4cadb9ab 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Jan 11 10:45:28 1999 Owen Taylor + + * gtk/gtkdnd.c: Only remove handlers for motion/button_release + at drop, remove "selection_get" handler later. + Mon Jan 11 13:31:49 1999 Tim Janik * gtk/gtktypeutils.[hc]: removed Paolo Molaro's type creation hooks diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 51776c0a2b..8d4cadb9ab 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Jan 11 10:45:28 1999 Owen Taylor + + * gtk/gtkdnd.c: Only remove handlers for motion/button_release + at drop, remove "selection_get" handler later. + Mon Jan 11 13:31:49 1999 Tim Janik * gtk/gtktypeutils.[hc]: removed Paolo Molaro's type creation hooks diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 9dab1b40e6..cd29c53d53 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -2334,7 +2334,8 @@ gtk_drag_source_info_destroy (gpointer data) if (info->widget) gtk_widget_unref (info->widget); - + + gtk_signal_disconnect_by_data (GTK_OBJECT (info->ipc_widget), info); gtk_selection_remove_all (info->ipc_widget); gtk_object_set_data (GTK_OBJECT (info->ipc_widget), "gtk-info", NULL); source_widgets = g_slist_remove (source_widgets, info->ipc_widget); @@ -2459,7 +2460,12 @@ gtk_drag_button_release_cb (GtkWidget *widget, } gtk_grab_remove (widget); - gtk_signal_disconnect_by_data (GTK_OBJECT (widget), info); + gtk_signal_disconnect_by_func (GTK_OBJECT (widget), + GTK_SIGNAL_FUNC (gtk_drag_button_release_cb), + info); + gtk_signal_disconnect_by_func (GTK_OBJECT (widget), + GTK_SIGNAL_FUNC (gtk_drag_motion_cb), + info); /* Send on a release pair to the the original * widget to convince it to release its grab. We need to