diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index d8e671b8b..dd8c8aea1 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+Sun Nov  5 10:25:40 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gsignal.c (handlers_find): When appending handlers and
+	not matching on signal_id, use hlist->signal_id instead of 
+	signal_id. Having the correct signal_id when unreffing
+	the handlers makes things work a lot better.
+
 2000-11-05  Tor Lillqvist  <tml@iki.fi>
 
 	* makefile.{mingw,msc}.in (gobject_OBJECTS): Add gtypeplugin.
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 4b8e658c2..bf8a8ee12 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -33,6 +33,7 @@ gobject_public_h_sources = @STRIP_BEGIN@ \
 	gsignal.h \
 	gtype.h \
 	gtypeplugin.h \
+	gtypepluginsimple.h \
 	gvalue.h \
 	gvaluecollector.h \
 	gvaluetypes.h \
@@ -53,6 +54,7 @@ gobject_c_sources = @STRIP_BEGIN@ \
 	gsignal.c \
 	gtype.c \
 	gtypeplugin.c \
+	gtypepluginsimple.c \
 	gvalue.c \
 	gvaluetypes.c \
 @STRIP_END@
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 841c329f8..beb6dbdac 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -433,7 +433,7 @@ handlers_find (gpointer         instance,
 						      handler->closure->meta_marshal == 0 &&
 						      ((GCClosure*) handler->closure)->callback == func)))
 		  {
-		    mlist = handler_match_prepend (mlist, handler, signal_id);
+		    mlist = handler_match_prepend (mlist, handler, hlist->signal_id);
 		    if (one_and_only)
 		      return mlist;
 		  }