for the emission of AFTER signals, fetch the objects signals via

Tue Feb  3 15:09:55 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtksignal.c (gtk_signal_real_emit): for the emission
          of AFTER signals, fetch the objects signals via
          gtk_signal_get_handlers again. some handlers might have
          been removed or added. not doing this would mess up the
          memchunk allocation of signal handlers (this had been
          triggered by multiple *_while_alive connections), bad, bad, bad!
          (gtk_handlers_run): do the referencing on signal handlers
          unconditionally, the invokation of AFTER handlers will now take
          care of modified lists.

        * gtk/gtksignal.h: added gtk_signal_connect_while_alive.

ChangeLog

@@ -1,3 +1,17 @@
+Tue Feb  3 15:09:55 1998  Tim Janik  <timj@gimp.org>
+
+        * gtk/gtksignal.c (gtk_signal_real_emit): for the emission
+          of AFTER signals, fetch the objects signals via
+          gtk_signal_get_handlers again. some handlers might have
+          been removed or added. not doing this would mess up the
+          memchunk allocation of signal handlers (this had been
+          triggered by multiple *_while_alive connections), bad, bad, bad!
+          (gtk_handlers_run): do the referencing on signal handlers
+          unconditionally, the invokation of AFTER handlers will now take
+          care of modified lists.
+
+        * gtk/gtksignal.h: added gtk_signal_connect_while_alive.
+
 Tue Feb  3 15:34:27 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gdk/gdkcolor.c (gdk_colormap_get_system): Only query

ChangeLog.pre-2-0

@@ -1,3 +1,17 @@
+Tue Feb  3 15:09:55 1998  Tim Janik  <timj@gimp.org>
+
+        * gtk/gtksignal.c (gtk_signal_real_emit): for the emission
+          of AFTER signals, fetch the objects signals via
+          gtk_signal_get_handlers again. some handlers might have
+          been removed or added. not doing this would mess up the
+          memchunk allocation of signal handlers (this had been
+          triggered by multiple *_while_alive connections), bad, bad, bad!
+          (gtk_handlers_run): do the referencing on signal handlers
+          unconditionally, the invokation of AFTER handlers will now take
+          care of modified lists.
+
+        * gtk/gtksignal.h: added gtk_signal_connect_while_alive.
+
 Tue Feb  3 15:34:27 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gdk/gdkcolor.c (gdk_colormap_get_system): Only query

ChangeLog.pre-2-10

@@ -1,3 +1,17 @@
+Tue Feb  3 15:09:55 1998  Tim Janik  <timj@gimp.org>
+
+        * gtk/gtksignal.c (gtk_signal_real_emit): for the emission
+          of AFTER signals, fetch the objects signals via
+          gtk_signal_get_handlers again. some handlers might have
+          been removed or added. not doing this would mess up the
+          memchunk allocation of signal handlers (this had been
+          triggered by multiple *_while_alive connections), bad, bad, bad!
+          (gtk_handlers_run): do the referencing on signal handlers
+          unconditionally, the invokation of AFTER handlers will now take
+          care of modified lists.
+
+        * gtk/gtksignal.h: added gtk_signal_connect_while_alive.
+
 Tue Feb  3 15:34:27 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gdk/gdkcolor.c (gdk_colormap_get_system): Only query

ChangeLog.pre-2-2

@@ -1,3 +1,17 @@
+Tue Feb  3 15:09:55 1998  Tim Janik  <timj@gimp.org>
+
+        * gtk/gtksignal.c (gtk_signal_real_emit): for the emission
+          of AFTER signals, fetch the objects signals via
+          gtk_signal_get_handlers again. some handlers might have
+          been removed or added. not doing this would mess up the
+          memchunk allocation of signal handlers (this had been
+          triggered by multiple *_while_alive connections), bad, bad, bad!
+          (gtk_handlers_run): do the referencing on signal handlers
+          unconditionally, the invokation of AFTER handlers will now take
+          care of modified lists.
+
+        * gtk/gtksignal.h: added gtk_signal_connect_while_alive.
+
 Tue Feb  3 15:34:27 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gdk/gdkcolor.c (gdk_colormap_get_system): Only query

ChangeLog.pre-2-4

@@ -1,3 +1,17 @@
+Tue Feb  3 15:09:55 1998  Tim Janik  <timj@gimp.org>
+
+        * gtk/gtksignal.c (gtk_signal_real_emit): for the emission
+          of AFTER signals, fetch the objects signals via
+          gtk_signal_get_handlers again. some handlers might have
+          been removed or added. not doing this would mess up the
+          memchunk allocation of signal handlers (this had been
+          triggered by multiple *_while_alive connections), bad, bad, bad!
+          (gtk_handlers_run): do the referencing on signal handlers
+          unconditionally, the invokation of AFTER handlers will now take
+          care of modified lists.
+
+        * gtk/gtksignal.h: added gtk_signal_connect_while_alive.
+
 Tue Feb  3 15:34:27 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gdk/gdkcolor.c (gdk_colormap_get_system): Only query

ChangeLog.pre-2-6

@@ -1,3 +1,17 @@
+Tue Feb  3 15:09:55 1998  Tim Janik  <timj@gimp.org>
+
+        * gtk/gtksignal.c (gtk_signal_real_emit): for the emission
+          of AFTER signals, fetch the objects signals via
+          gtk_signal_get_handlers again. some handlers might have
+          been removed or added. not doing this would mess up the
+          memchunk allocation of signal handlers (this had been
+          triggered by multiple *_while_alive connections), bad, bad, bad!
+          (gtk_handlers_run): do the referencing on signal handlers
+          unconditionally, the invokation of AFTER handlers will now take
+          care of modified lists.
+
+        * gtk/gtksignal.h: added gtk_signal_connect_while_alive.
+
 Tue Feb  3 15:34:27 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gdk/gdkcolor.c (gdk_colormap_get_system): Only query

ChangeLog.pre-2-8

@@ -1,3 +1,17 @@
+Tue Feb  3 15:09:55 1998  Tim Janik  <timj@gimp.org>
+
+        * gtk/gtksignal.c (gtk_signal_real_emit): for the emission
+          of AFTER signals, fetch the objects signals via
+          gtk_signal_get_handlers again. some handlers might have
+          been removed or added. not doing this would mess up the
+          memchunk allocation of signal handlers (this had been
+          triggered by multiple *_while_alive connections), bad, bad, bad!
+          (gtk_handlers_run): do the referencing on signal handlers
+          unconditionally, the invokation of AFTER handlers will now take
+          care of modified lists.
+
+        * gtk/gtksignal.h: added gtk_signal_connect_while_alive.
+
 Tue Feb  3 15:34:27 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gdk/gdkcolor.c (gdk_colormap_get_system): Only query

gtk/gtkobject.c

@@ -420,6 +420,9 @@ gtk_object_finalize (GtkObject *object)
 void
 gtk_object_sink (GtkObject *object)
 {
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GTK_IS_OBJECT (object));
+
   if (GTK_OBJECT_FLOATING (object))
     {
       GTK_OBJECT_UNSET_FLAGS (object, GTK_FLOATING);

gtk/gtksignal.c

@@ -555,6 +555,37 @@ gtk_alive_disconnecter (GtkDisconnectInfo *info)
   return 0;
 }
 
+void
+gtk_signal_connect_while_alive (GtkObject        *object,
+				const gchar      *signal,
+				GtkSignalFunc     func,
+				gpointer          func_data,
+				GtkObject        *alive_object)
+{
+  GtkDisconnectInfo *info;
+
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GTK_IS_OBJECT (object));
+  g_return_if_fail (signal != NULL);
+  g_return_if_fail (func != NULL);
+  g_return_if_fail (alive_object != NULL);
+  g_return_if_fail (GTK_IS_OBJECT (alive_object));
+
+  info = g_new (GtkDisconnectInfo, 1);
+  info->object1 = object;
+  info->object2 = alive_object;
+
+  info->signal_handler = gtk_signal_connect (object, signal, func, func_data);
+  info->disconnect_handler1 = gtk_signal_connect_object (info->object1,
+							 "destroy",
+							 GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
+							 (GtkObject*) info);
+  info->disconnect_handler2 = gtk_signal_connect_object (info->object2,
+							 "destroy",
+							 GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
+							 (GtkObject*) info);
+}
+
 void
 gtk_signal_connect_object_while_alive (GtkObject        *object,
 				       const gchar      *signal,
@@ -881,6 +912,13 @@ gtk_signal_handler_unref (GtkHandler *handler,
 {
   GtkHandler *tmp;
 
+  if (!handler->ref_count)
+    {
+      /* FIXME: i wanna get removed some when (maybe at gtk+-1.0?) */
+      g_warning ("gtk_signal_handler_unref(): handler with ref_count==0!");
+      return;
+    }
+
   handler->ref_count -= 1;
   if (handler->ref_count == 0)
     {
@@ -1013,6 +1051,7 @@ restart:
 				NULL, params);
     }
   
+  handlers = gtk_signal_get_handlers (object, signal_type);
   switch (gtk_handlers_run (handlers, &info, TRUE))
     {
     case DONE:
@@ -1223,12 +1262,12 @@ gtk_handlers_run (GtkHandler     *handlers,
   
   while (handlers)
     {
-      if (!after)
+      /* REMOVE: if (!after) */
       gtk_signal_handler_ref (handlers);
       
       if (handlers->signal_type != info->signal_type)
 	{
-	  if (after)
+	  /* REMOVE: if (after) */
 	  gtk_signal_handler_unref (handlers, info->object);
 	  break;
 	}
@@ -1270,7 +1309,7 @@ gtk_handlers_run (GtkHandler     *handlers,
 	      if (info->run_type & GTK_RUN_NO_RECURSE)
 		gtk_emission_remove (&restart_emissions, info->object,
 				     info->signal_type);
-	      if (after)
+	      /* REMOVE: if (after) */
 	      gtk_signal_handler_unref (handlers, info->object);
 	      return DONE;
 	    }
@@ -1280,14 +1319,14 @@ gtk_handlers_run (GtkHandler     *handlers,
 	    {
 	      gtk_emission_remove (&restart_emissions, info->object,
 				   info->signal_type);
-	      if (after)
+	      /* REMOVE: if (after) */
 	      gtk_signal_handler_unref (handlers, info->object);
 	      return RESTART;
 	    }
 	}
 
       handlers_next = handlers->next;
-      if (after)
+      /* if (after) */
 	gtk_signal_handler_unref (handlers, info->object);
       handlers = handlers_next;
     }

gtk/gtksignal.h

@@ -113,6 +113,11 @@ void   gtk_signal_connect_object_while_alive (GtkObject        *object,
 					      const gchar      *signal,
 					      GtkSignalFunc     func,
 					      GtkObject        *alive_object);
+void   gtk_signal_connect_while_alive	     (GtkObject        *object,
+					      const gchar      *signal,
+					      GtkSignalFunc     func,
+					      gpointer          func_data,
+					      GtkObject        *alive_object);
 
 void   gtk_signal_disconnect              (GtkObject           *object,
 					   gint                 anid);