s/signal_newc/signal_new/

Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>

        * gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/

        * gtk/gtkobject.c (gtk_object_destroy): invoke
        g_object_run_dispose().

        * gtk/gtkwindow.c:
        * gtk/gtkwidget.c:
        * gtk/gtkobject.c:
        * gtk/gtklist.c: s/shutdown/dispose/ for the GObject
        method.

23 files changed, 219 insertions, 124 deletions

diff --git a/ChangeLog b/ChangeLog
index 94abf571b9..dfb7e1e1e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
+
+	* gtk/gtkobject.c (gtk_object_destroy): invoke
+	g_object_run_dispose().
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkwidget.c: 
+	* gtk/gtkobject.c:
+	* gtk/gtklist.c: s/shutdown/dispose/ for the GObject
+	method.
+
 Sat Jun 30 20:44:48 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktypeutils.c (gtk_type_class): Remove
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 94abf571b9..dfb7e1e1e3 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
+
+	* gtk/gtkobject.c (gtk_object_destroy): invoke
+	g_object_run_dispose().
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkwidget.c: 
+	* gtk/gtkobject.c:
+	* gtk/gtklist.c: s/shutdown/dispose/ for the GObject
+	method.
+
 Sat Jun 30 20:44:48 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktypeutils.c (gtk_type_class): Remove
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 94abf571b9..dfb7e1e1e3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
+
+	* gtk/gtkobject.c (gtk_object_destroy): invoke
+	g_object_run_dispose().
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkwidget.c: 
+	* gtk/gtkobject.c:
+	* gtk/gtklist.c: s/shutdown/dispose/ for the GObject
+	method.
+
 Sat Jun 30 20:44:48 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktypeutils.c (gtk_type_class): Remove
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 94abf571b9..dfb7e1e1e3 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
+
+	* gtk/gtkobject.c (gtk_object_destroy): invoke
+	g_object_run_dispose().
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkwidget.c: 
+	* gtk/gtkobject.c:
+	* gtk/gtklist.c: s/shutdown/dispose/ for the GObject
+	method.
+
 Sat Jun 30 20:44:48 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktypeutils.c (gtk_type_class): Remove
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 94abf571b9..dfb7e1e1e3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
+
+	* gtk/gtkobject.c (gtk_object_destroy): invoke
+	g_object_run_dispose().
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkwidget.c: 
+	* gtk/gtkobject.c:
+	* gtk/gtklist.c: s/shutdown/dispose/ for the GObject
+	method.
+
 Sat Jun 30 20:44:48 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktypeutils.c (gtk_type_class): Remove
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 94abf571b9..dfb7e1e1e3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
+
+	* gtk/gtkobject.c (gtk_object_destroy): invoke
+	g_object_run_dispose().
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkwidget.c: 
+	* gtk/gtkobject.c:
+	* gtk/gtklist.c: s/shutdown/dispose/ for the GObject
+	method.
+
 Sat Jun 30 20:44:48 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktypeutils.c (gtk_type_class): Remove
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 94abf571b9..dfb7e1e1e3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
+
+	* gtk/gtkobject.c (gtk_object_destroy): invoke
+	g_object_run_dispose().
+
+	* gtk/gtkwindow.c: 
+	* gtk/gtkwidget.c: 
+	* gtk/gtkobject.c:
+	* gtk/gtklist.c: s/shutdown/dispose/ for the GObject
+	method.
+
 Sat Jun 30 20:44:48 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktypeutils.c (gtk_type_class): Remove
diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml
index 572bd69743..fae924b331 100644
--- a/docs/reference/gdk/tmpl/input_devices.sgml
+++ b/docs/reference/gdk/tmpl/input_devices.sgml
@@ -96,6 +96,7 @@ sets of additional valuators than the pressure xtilt and ytilt.
 
 </para>
 
+@parent_instance: 
 @name: 
 @source: 
 @mode: 
diff --git a/docs/reference/gdk/tmpl/visuals.sgml b/docs/reference/gdk/tmpl/visuals.sgml
index a256eba6a4..1f250ce1b6 100644
--- a/docs/reference/gdk/tmpl/visuals.sgml
+++ b/docs/reference/gdk/tmpl/visuals.sgml
@@ -19,6 +19,7 @@ Visuals
 
 </para>
 
+@parent_instance: 
 @type: 
 @depth: 
 @byte_order: 
@@ -140,20 +141,24 @@ Visuals
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_visual_ref ##### -->
+<!-- ##### MACRO gdk_visual_ref ##### -->
 <para>
 
 </para>
 
-@visual: 
+@v: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@visual: 
 
 
-<!-- ##### FUNCTION gdk_visual_unref ##### -->
+<!-- ##### MACRO gdk_visual_unref ##### -->
 <para>
 
 </para>
 
+@v: 
+<!-- # Unused Parameters # -->
 @visual: 
 
 
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index baf0db19bd..1bc494f4c9 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1365,6 +1365,13 @@ is enabled.
 @n_args: 
 @args: 
 
+<!-- ##### FUNCTION gtk_container_dequeue_resize_handler ##### -->
+<para>
+
+</para>
+
+@container: 
+
 <!-- ##### FUNCTION gtk_container_focus ##### -->
 <para>
 
@@ -1500,6 +1507,15 @@ Get the type of GtkIdentifier.
 @str: 
 @Returns: 
 
+<!-- ##### FUNCTION gtk_list_store_new_with_types ##### -->
+<para>
+
+</para>
+
+@n_columns: 
+@Varargs: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_list_store_set_cell ##### -->
 <para>
 
@@ -1510,6 +1526,23 @@ Get the type of GtkIdentifier.
 @column: 
 @value: 
 
+<!-- ##### FUNCTION gtk_list_store_set_column_type ##### -->
+<para>
+
+</para>
+
+@store: 
+@column: 
+@type: 
+
+<!-- ##### FUNCTION gtk_list_store_set_n_columns ##### -->
+<para>
+
+</para>
+
+@store: 
+@n_columns: 
+
 <!-- ##### FUNCTION gtk_menu_ensure_uline_accel_group ##### -->
 <para>
 
@@ -1810,6 +1843,13 @@ Sets the function that GTK+ will use to load images
 
 @ruler: the gtkruler
 
+<!-- ##### FUNCTION gtk_settings_get_global ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
 <!-- ##### FUNCTION gtk_signal_add_emission_hook ##### -->
 <para>
 Add an emission hook for a type of signal, for any object.
@@ -2011,6 +2051,15 @@ a gtk_object_unref().
 @tree_model: 
 @iter: 
 
+<!-- ##### FUNCTION gtk_tree_store_new_with_types ##### -->
+<para>
+
+</para>
+
+@n_columns: 
+@Varargs: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_tree_store_set_cell ##### -->
 <para>
 
@@ -2021,6 +2070,24 @@ a gtk_object_unref().
 @column: 
 @value: 
 
+<!-- ##### FUNCTION gtk_tree_store_set_column_type ##### -->
+<para>
+
+</para>
+
+@tree_store: 
+@column: 
+@type: 
+@store: 
+
+<!-- ##### FUNCTION gtk_tree_store_set_n_columns ##### -->
+<para>
+
+</para>
+
+@tree_store: 
+@n_columns: 
+
 <!-- ##### FUNCTION gtk_tree_view_column_set_cell_data ##### -->
 <para>
 
@@ -2153,6 +2220,12 @@ fundamental type.
 @group_cycling: 
 @Returns: 
 
+<!-- ##### FUNCTION gtk_widget_pop_style ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION gtk_widget_popup ##### -->
 <para>
 
@@ -2162,6 +2235,13 @@ fundamental type.
 @x: 
 @y: 
 
+<!-- ##### FUNCTION gtk_widget_push_style ##### -->
+<para>
+
+</para>
+
+@style: 
+
 <!-- ##### FUNCTION gtk_window_activate_mnemonic ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
index 804212ea21..8a261586ac 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
@@ -30,12 +30,14 @@ GtkCellRenderer
 </para>
 
 @parent: 
-@can_activate: 
-@visible: 
 @xalign: 
 @yalign: 
+@width: 
+@height: 
 @xpad: 
 @ypad: 
+@can_activate: 
+@visible: 
 
 <!-- ##### FUNCTION gtk_cell_renderer_get_size ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index 2cecd0a390..7fab139046 100644
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -212,14 +212,6 @@ GtkContainer
 @border_width: 
 
 
-<!-- ##### FUNCTION gtk_container_dequeue_resize_handler ##### -->
-<para>
-
-</para>
-
-@container: 
-
-
 <!-- ##### FUNCTION gtk_container_propagate_expose ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkliststore.sgml b/docs/reference/gtk/tmpl/gtkliststore.sgml
index 905920222c..a83c4cef94 100644
--- a/docs/reference/gtk/tmpl/gtkliststore.sgml
+++ b/docs/reference/gtk/tmpl/gtkliststore.sgml
@@ -26,38 +26,11 @@ GtkListStore
 
 </para>
 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_list_store_new_with_types ##### -->
-<para>
-
-</para>
-
 @n_columns: 
 @Varargs: 
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_list_store_set_n_columns ##### -->
-<para>
-
-</para>
-
-@store: 
-@n_columns: 
-
-
-<!-- ##### FUNCTION gtk_list_store_set_column_type ##### -->
-<para>
-
-</para>
-
-@store: 
-@column: 
-@type: 
-
-
 <!-- ##### FUNCTION gtk_list_store_remove ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 30ffca8235..cc0b23b6d2 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
+@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 
diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml
index 28e2edd654..6653ec76e2 100644
--- a/docs/reference/gtk/tmpl/gtksettings.sgml
+++ b/docs/reference/gtk/tmpl/gtksettings.sgml
@@ -34,21 +34,14 @@ GtkSettings
 @origin: 
 @value: 
 
-<!-- ##### FUNCTION gtk_settings_get_global ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_settings_install_property ##### -->
 <para>
 
 </para>
 
-@settings: 
 @pspec: 
+<!-- # Unused Parameters # -->
+@settings: 
 
 
 <!-- ##### FUNCTION gtk_settings_install_property_parser ##### -->
@@ -56,9 +49,10 @@ GtkSettings
 
 </para>
 
-@settings: 
 @pspec: 
 @parser: 
+<!-- # Unused Parameters # -->
+@settings: 
 
 
 <!-- ##### FUNCTION gtk_rc_property_parse_color ##### -->
diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml
index db78575aa5..7d1551c5ef 100644
--- a/docs/reference/gtk/tmpl/gtktreestore.sgml
+++ b/docs/reference/gtk/tmpl/gtktreestore.sgml
@@ -34,40 +34,11 @@ GtkTreeStore
 
 </para>
 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_tree_store_new_with_types ##### -->
-<para>
-
-</para>
-
 @n_columns: 
 @Varargs: 
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_tree_store_set_n_columns ##### -->
-<para>
-
-</para>
-
-@tree_store: 
-@n_columns: 
-
-
-<!-- ##### FUNCTION gtk_tree_store_set_column_type ##### -->
-<para>
-
-</para>
-
-@tree_store: 
-@column: 
-@type: 
-<!-- # Unused Parameters # -->
-@store: 
-
-
 <!-- ##### FUNCTION gtk_tree_store_set_value ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
index 06b8f986b7..435f5d971a 100644
--- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
@@ -35,6 +35,7 @@ GtkTreeViewColumn
 @window: 
 @xalign: 
 @property_changed_signal: 
+@spacing: 
 @width: 
 @requested_width: 
 @min_width: 
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 3160d91fb9..01e7f0763b 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -819,7 +819,7 @@ GtkWidget
 @style: 
 
 
-<!-- ##### FUNCTION gtk_widget_set_rc_style ##### -->
+<!-- ##### MACRO gtk_widget_set_rc_style ##### -->
 <para>
 
 </para>
@@ -844,7 +844,7 @@ GtkWidget
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_widget_restore_default_style ##### -->
+<!-- ##### MACRO gtk_widget_restore_default_style ##### -->
 <para>
 
 </para>
@@ -860,14 +860,6 @@ GtkWidget
 @widget: 
 
 
-<!-- ##### FUNCTION gtk_widget_push_style ##### -->
-<para>
-
-</para>
-
-@style: 
-
-
 <!-- ##### FUNCTION gtk_widget_push_colormap ##### -->
 <para>
 
@@ -876,13 +868,6 @@ GtkWidget
 @cmap: 
 
 
-<!-- ##### FUNCTION gtk_widget_pop_style ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### FUNCTION gtk_widget_pop_colormap ##### -->
 <para>
 
@@ -1605,6 +1590,7 @@ a widget changes from un-anchored to anchored or vice-versa.
 </para>
 
 @widget: the object which received the signal.
+@widget: 
 
 <!-- ##### SIGNAL GtkWidget::key-press-event ##### -->
 <para>
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index a47d8a9a59..c978d62f3a 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -84,14 +84,14 @@ gdk_keymap_class_init (GdkKeymapClass *klass)
   object_class->finalize = gdk_keymap_finalize;
 
   signals[DIRECTION_CHANGED] =
-    g_signal_newc ("direction_changed",
-                   G_OBJECT_CLASS_TYPE (object_class),
-                   G_SIGNAL_RUN_LAST,
-                   G_STRUCT_OFFSET (GdkKeymapClass, direction_changed),
-                   NULL, NULL,
-                   g_cclosure_marshal_VOID__VOID,
-                   G_TYPE_NONE,
-                   0);
+    g_signal_new ("direction_changed",
+		  G_OBJECT_CLASS_TYPE (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (GdkKeymapClass, direction_changed),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE,
+		  0);
 }
 
 static void
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 189dd633ff..473c5d36d9 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -56,7 +56,7 @@ static void gtk_list_get_arg         (GtkObject      *object,
 				      GtkArg         *arg,
 				      guint           arg_id);
 /*** GtkObject Methods ***/
-static void gtk_list_shutdown	     (GObject	     *object);
+static void gtk_list_dispose	     (GObject	     *object);
 
 /*** GtkWidget Methods ***/
 static void gtk_list_size_request    (GtkWidget	     *widget,
@@ -213,7 +213,7 @@ gtk_list_class_init (GtkListClass *class)
   vadjustment_key_id = g_quark_from_static_string (vadjustment_key);
   hadjustment_key_id = g_quark_from_static_string (hadjustment_key);
 
-  gobject_class->shutdown = gtk_list_shutdown;
+  gobject_class->dispose = gtk_list_dispose;
 
 
   object_class->set_arg = gtk_list_set_arg;
@@ -336,14 +336,14 @@ gtk_list_new (void)
 
 /* Private GtkObject Methods :
  * 
- * gtk_list_shutdown
+ * gtk_list_dispose
  */
 static void
-gtk_list_shutdown (GObject *object)
+gtk_list_dispose (GObject *object)
 {
   gtk_list_clear_items (GTK_LIST (object), 0, -1);
 
-  G_OBJECT_CLASS (parent_class)->shutdown (object);
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 272eef2f89..a0f60a1810 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -55,7 +55,7 @@ static void	  gtk_object_get_property	 (GObject	 *object,
 						  guint           property_id,
 						  GValue         *value,
 						  GParamSpec     *pspec);
-static void       gtk_object_shutdown            (GObject        *object);
+static void       gtk_object_dispose            (GObject        *object);
 static void       gtk_object_real_destroy        (GtkObject      *object);
 static void       gtk_object_finalize            (GObject        *object);
 static void       gtk_object_notify_weaks        (GtkObject      *object);
@@ -317,7 +317,7 @@ gtk_object_class_init (GtkObjectClass *class)
 
   gobject_class->set_property = gtk_object_set_property;
   gobject_class->get_property = gtk_object_get_property;
-  gobject_class->shutdown = gtk_object_shutdown;
+  gobject_class->dispose = gtk_object_dispose;
   gobject_class->finalize = gtk_object_finalize;
 
   class->destroy = gtk_object_real_destroy;
@@ -358,14 +358,12 @@ gtk_object_destroy (GtkObject *object)
       /* need to hold a reference count around all class method
        * invocations.
        */
-      gtk_object_ref (object);
-      G_OBJECT_GET_CLASS (object)->shutdown (G_OBJECT (object));
-      gtk_object_unref (object);
+      g_object_run_dispose (G_OBJECT (object));
     }
 }
 
 static void
-gtk_object_shutdown (GObject *gobject)
+gtk_object_dispose (GObject *gobject)
 {
   GtkObject *object = GTK_OBJECT (gobject);
 
@@ -381,7 +379,7 @@ gtk_object_shutdown (GObject *gobject)
       GTK_OBJECT_UNSET_FLAGS (object, GTK_DESTROYED);
     }
 
-  G_OBJECT_CLASS (parent_class)->shutdown (gobject);
+  G_OBJECT_CLASS (parent_class)->dispose (gobject);
 }
 
 static void
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 6bff279225..3a2848b521 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -161,7 +161,7 @@ static void	gtk_widget_get_property		 (GObject           *object,
 						  guint              prop_id,
 						  GValue            *value,
 						  GParamSpec        *pspec);
-static void	gtk_widget_shutdown		 (GObject	    *object);
+static void	gtk_widget_dispose		 (GObject	    *object);
 static void	gtk_widget_real_destroy		 (GtkObject	    *object);
 static void	gtk_widget_finalize		 (GObject	    *object);
 static void	gtk_widget_real_show		 (GtkWidget	    *widget);
@@ -317,7 +317,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   cpn_context.dispatcher = child_property_notify_dispatcher;
   _gtk_widget_child_property_notify_context = &cpn_context;
 
-  gobject_class->shutdown = gtk_widget_shutdown;
+  gobject_class->dispose = gtk_widget_dispose;
   gobject_class->finalize = gtk_widget_finalize;
   gobject_class->set_property = gtk_widget_set_property;
   gobject_class->get_property = gtk_widget_get_property;
@@ -5082,7 +5082,7 @@ gtk_widget_get_default_direction (void)
 }
 
 static void
-gtk_widget_shutdown (GObject *object)
+gtk_widget_dispose (GObject *object)
 {
   GtkWidget *widget = GTK_WIDGET (object);
 
@@ -5093,7 +5093,7 @@ gtk_widget_shutdown (GObject *object)
   if (GTK_WIDGET_REALIZED (widget))
     gtk_widget_unrealize (widget);
   
-  G_OBJECT_CLASS (parent_class)->shutdown (object);
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 1ebd9f19f6..153b1c6abe 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -110,7 +110,7 @@ typedef struct {
 
 static void gtk_window_class_init         (GtkWindowClass    *klass);
 static void gtk_window_init               (GtkWindow         *window);
-static void gtk_window_shutdown           (GObject           *object);
+static void gtk_window_dispose            (GObject           *object);
 static void gtk_window_destroy            (GtkObject         *object);
 static void gtk_window_finalize           (GObject           *object);
 static void gtk_window_show               (GtkWidget         *widget);
@@ -278,7 +278,7 @@ gtk_window_class_init (GtkWindowClass *klass)
   
   parent_class = gtk_type_class (gtk_bin_get_type ());
 
-  gobject_class->shutdown = gtk_window_shutdown;
+  gobject_class->dispose = gtk_window_dispose;
   gobject_class->finalize = gtk_window_finalize;
 
   gobject_class->set_property = gtk_window_set_property;
@@ -1328,7 +1328,7 @@ _gtk_window_reposition (GtkWindow *window,
 }
 
 static void
-gtk_window_shutdown (GObject *object)
+gtk_window_dispose (GObject *object)
 {
   GtkWindow *window;
 
@@ -1339,7 +1339,7 @@ gtk_window_shutdown (GObject *object)
   gtk_window_set_focus (window, NULL);
   gtk_window_set_default (window, NULL);
 
-  G_OBJECT_CLASS (parent_class)->shutdown (object);
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void