when unref-ing the handlers, also invalidate them. bug nailed down by Karl

Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
        the handlers, also invalidate them. bug nailed down by Karl Nelson
        <kenelson@ece.ucdavis.edu>.

8 files changed, 52 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b677a7f3..568500843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+	the handlers, also invalidate them. bug nailed down by Karl Nelson
+	<kenelson@ece.ucdavis.edu>.
+
 Mon Mar 13 18:37:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty()
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4b677a7f3..568500843 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+	the handlers, also invalidate them. bug nailed down by Karl Nelson
+	<kenelson@ece.ucdavis.edu>.
+
 Mon Mar 13 18:37:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty()
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4b677a7f3..568500843 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+	the handlers, also invalidate them. bug nailed down by Karl Nelson
+	<kenelson@ece.ucdavis.edu>.
+
 Mon Mar 13 18:37:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty()
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4b677a7f3..568500843 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+	the handlers, also invalidate them. bug nailed down by Karl Nelson
+	<kenelson@ece.ucdavis.edu>.
+
 Mon Mar 13 18:37:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty()
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4b677a7f3..568500843 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+	the handlers, also invalidate them. bug nailed down by Karl Nelson
+	<kenelson@ece.ucdavis.edu>.
+
 Mon Mar 13 18:37:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty()
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4b677a7f3..568500843 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+	the handlers, also invalidate them. bug nailed down by Karl Nelson
+	<kenelson@ece.ucdavis.edu>.
+
 Mon Mar 13 18:37:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty()
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4b677a7f3..568500843 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+	the handlers, also invalidate them. bug nailed down by Karl Nelson
+	<kenelson@ece.ucdavis.edu>.
+
 Mon Mar 13 18:37:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkdnd.c: Fix a bunch of cases where XGetWindowProperty()
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 97ea7cf1d..eada9bb84 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);
+	}
     }
 }