From 2e34ce303a0473dcb96af41a4902bd091d36d435 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 26 Mar 2000 01:30:34 +0000 Subject: [PATCH] when unref-ing the handlers, also invalidate them. bug nailed down by Karl Sun Mar 26 03:21:28 2000 Tim Janik * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing the handlers, also invalidate them. bug nailed down by Karl Nelson . --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtksignal.c | 12 ++++++++++-- 8 files changed, 52 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b677a7f30..568500843a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Mar 26 03:21:28 2000 Tim Janik + + * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing + the handlers, also invalidate them. bug nailed down by Karl Nelson + . + Mon Mar 13 18:37:55 2000 Owen Taylor * gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4b677a7f30..568500843a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sun Mar 26 03:21:28 2000 Tim Janik + + * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing + the handlers, also invalidate them. bug nailed down by Karl Nelson + . + Mon Mar 13 18:37:55 2000 Owen Taylor * gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4b677a7f30..568500843a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Mar 26 03:21:28 2000 Tim Janik + + * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing + the handlers, also invalidate them. bug nailed down by Karl Nelson + . + Mon Mar 13 18:37:55 2000 Owen Taylor * gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4b677a7f30..568500843a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sun Mar 26 03:21:28 2000 Tim Janik + + * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing + the handlers, also invalidate them. bug nailed down by Karl Nelson + . + Mon Mar 13 18:37:55 2000 Owen Taylor * gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4b677a7f30..568500843a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Mar 26 03:21:28 2000 Tim Janik + + * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing + the handlers, also invalidate them. bug nailed down by Karl Nelson + . + Mon Mar 13 18:37:55 2000 Owen Taylor * gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4b677a7f30..568500843a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Mar 26 03:21:28 2000 Tim Janik + + * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing + the handlers, also invalidate them. bug nailed down by Karl Nelson + . + Mon Mar 13 18:37:55 2000 Owen Taylor * gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4b677a7f30..568500843a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Mar 26 03:21:28 2000 Tim Janik + + * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing + the handlers, also invalidate them. bug nailed down by Karl Nelson + . + Mon Mar 13 18:37:55 2000 Owen Taylor * gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty() diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 97ea7cf1d4..eada9bb84b 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -1190,12 +1190,20 @@ gtk_signal_handlers_destroy (GtkObject *object) next = handler->next; if (handler->id > 0) - gtk_signal_handler_unref (handler, object); + { + handler->id = 0; + handler->blocked += 1; + gtk_signal_handler_unref (handler, object); + } handler = next; } handler = gtk_object_get_data_by_id (object, gtk_handler_quark); if (handler->id > 0) - gtk_signal_handler_unref (handler, object); + { + handler->id = 0; + handler->blocked += 1; + gtk_signal_handler_unref (handler, object); + } } }