diff --git a/ChangeLog b/ChangeLog
index fb8cbaa031..c4d8f65fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-15  Murray Cumming <murrayc@usa.net
+
+	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
+	  Corrected the type names used in some calls to g_signal_new().
+	
 Sat Oct 13 07:09:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fb8cbaa031..c4d8f65fd7 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-10-15  Murray Cumming <murrayc@usa.net
+
+	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
+	  Corrected the type names used in some calls to g_signal_new().
+	
 Sat Oct 13 07:09:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fb8cbaa031..c4d8f65fd7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-10-15  Murray Cumming <murrayc@usa.net
+
+	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
+	  Corrected the type names used in some calls to g_signal_new().
+	
 Sat Oct 13 07:09:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fb8cbaa031..c4d8f65fd7 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-10-15  Murray Cumming <murrayc@usa.net
+
+	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
+	  Corrected the type names used in some calls to g_signal_new().
+	
 Sat Oct 13 07:09:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fb8cbaa031..c4d8f65fd7 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-10-15  Murray Cumming <murrayc@usa.net
+
+	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
+	  Corrected the type names used in some calls to g_signal_new().
+	
 Sat Oct 13 07:09:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fb8cbaa031..c4d8f65fd7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-10-15  Murray Cumming <murrayc@usa.net
+
+	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
+	  Corrected the type names used in some calls to g_signal_new().
+	
 Sat Oct 13 07:09:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fb8cbaa031..c4d8f65fd7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-10-15  Murray Cumming <murrayc@usa.net
+
+	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
+	  Corrected the type names used in some calls to g_signal_new().
+	
 Sat Oct 13 07:09:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index b35999a986..bbba66060c 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -146,16 +146,16 @@ gtk_input_dialog_class_init (GtkInputDialogClass *klass)
 		    GTK_RUN_LAST,
 		    GTK_CLASS_TYPE (object_class),
 		    GTK_SIGNAL_OFFSET (GtkInputDialogClass, enable_device),
-		    gtk_marshal_VOID__POINTER,
-		    GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		    gtk_marshal_VOID__OBJECT,
+		    GTK_TYPE_NONE, 1, GDK_TYPE_DEVICE);
 
   input_dialog_signals[DISABLE_DEVICE] =
     gtk_signal_new ("disable_device",
 		    GTK_RUN_LAST,
 		    GTK_CLASS_TYPE (object_class),
 		    GTK_SIGNAL_OFFSET (GtkInputDialogClass, disable_device),
-		    gtk_marshal_VOID__POINTER,
-		    GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		    gtk_marshal_VOID__OBJECT,
+		    GTK_TYPE_NONE, 1, GDK_TYPE_DEVICE);
 }
 
 static void
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 27e5ec4e1e..edacd09526 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -207,7 +207,7 @@ gtk_toolbar_class_init (GtkToolbarClass *class)
 		    GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed),
 		    gtk_marshal_VOID__INT,
 		    GTK_TYPE_NONE, 1,
-		    GTK_TYPE_INT);
+		    GTK_TYPE_ORIENTATION);
   toolbar_signals[STYLE_CHANGED] =
     gtk_signal_new ("style_changed",
 		    GTK_RUN_FIRST,
@@ -215,7 +215,7 @@ gtk_toolbar_class_init (GtkToolbarClass *class)
 		    GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed),
 		    gtk_marshal_VOID__INT,
 		    GTK_TYPE_NONE, 1,
-		    GTK_TYPE_INT);
+		    GTK_TYPE_TOOLBAR_STYLE);
   
   g_object_class_install_property (gobject_class,
 				   PROP_ORIENTATION,
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index dfcb24cde7..52f0203573 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -575,7 +575,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 		    GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
 		    gtk_marshal_VOID__OBJECT,
 		    GTK_TYPE_NONE, 1,
-		    GTK_TYPE_OBJECT);
+		    GTK_TYPE_WIDGET);
   widget_signals[HIERARCHY_CHANGED] =
     gtk_signal_new ("hierarchy_changed",
 		    GTK_RUN_LAST,