diff options
103 files changed, 303 insertions, 196 deletions
@@ -1,3 +1,12 @@ +Sat Jul 4 13:16:24 1998 Tim Janik <timj@gtk.org> + + * gtk/*.c: changed reversed_[12] to reserved_[12] in gtk_*_get_type + functions. + + * gdk/gdkwindow.c: + * gdk/gdkvisual.c: check for some pointer values to be != NULL, prior + to XFree() calls. + 1998-07-03 Federico Mena Quintero <federico@nuclecu.unam.mx> * gtk/gtkfeatures.h.in: Added GDK_HAVE_FULL_CROSSING_EVENT, since diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2c0064057b..25e29d4549 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Sat Jul 4 13:16:24 1998 Tim Janik <timj@gtk.org> + + * gtk/*.c: changed reversed_[12] to reserved_[12] in gtk_*_get_type + functions. + + * gdk/gdkwindow.c: + * gdk/gdkvisual.c: check for some pointer values to be != NULL, prior + to XFree() calls. + 1998-07-03 Federico Mena Quintero <federico@nuclecu.unam.mx> * gtk/gtkfeatures.h.in: Added GDK_HAVE_FULL_CROSSING_EVENT, since diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2c0064057b..25e29d4549 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Sat Jul 4 13:16:24 1998 Tim Janik <timj@gtk.org> + + * gtk/*.c: changed reversed_[12] to reserved_[12] in gtk_*_get_type + functions. + + * gdk/gdkwindow.c: + * gdk/gdkvisual.c: check for some pointer values to be != NULL, prior + to XFree() calls. + 1998-07-03 Federico Mena Quintero <federico@nuclecu.unam.mx> * gtk/gtkfeatures.h.in: Added GDK_HAVE_FULL_CROSSING_EVENT, since diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2c0064057b..25e29d4549 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Sat Jul 4 13:16:24 1998 Tim Janik <timj@gtk.org> + + * gtk/*.c: changed reversed_[12] to reserved_[12] in gtk_*_get_type + functions. + + * gdk/gdkwindow.c: + * gdk/gdkvisual.c: check for some pointer values to be != NULL, prior + to XFree() calls. + 1998-07-03 Federico Mena Quintero <federico@nuclecu.unam.mx> * gtk/gtkfeatures.h.in: Added GDK_HAVE_FULL_CROSSING_EVENT, since diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2c0064057b..25e29d4549 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Sat Jul 4 13:16:24 1998 Tim Janik <timj@gtk.org> + + * gtk/*.c: changed reversed_[12] to reserved_[12] in gtk_*_get_type + functions. + + * gdk/gdkwindow.c: + * gdk/gdkvisual.c: check for some pointer values to be != NULL, prior + to XFree() calls. + 1998-07-03 Federico Mena Quintero <federico@nuclecu.unam.mx> * gtk/gtkfeatures.h.in: Added GDK_HAVE_FULL_CROSSING_EVENT, since diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2c0064057b..25e29d4549 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Sat Jul 4 13:16:24 1998 Tim Janik <timj@gtk.org> + + * gtk/*.c: changed reversed_[12] to reserved_[12] in gtk_*_get_type + functions. + + * gdk/gdkwindow.c: + * gdk/gdkvisual.c: check for some pointer values to be != NULL, prior + to XFree() calls. + 1998-07-03 Federico Mena Quintero <federico@nuclecu.unam.mx> * gtk/gtkfeatures.h.in: Added GDK_HAVE_FULL_CROSSING_EVENT, since diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2c0064057b..25e29d4549 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Sat Jul 4 13:16:24 1998 Tim Janik <timj@gtk.org> + + * gtk/*.c: changed reversed_[12] to reserved_[12] in gtk_*_get_type + functions. + + * gdk/gdkwindow.c: + * gdk/gdkvisual.c: check for some pointer values to be != NULL, prior + to XFree() calls. + 1998-07-03 Federico Mena Quintero <federico@nuclecu.unam.mx> * gtk/gtkfeatures.h.in: Added GDK_HAVE_FULL_CROSSING_EVENT, since diff --git a/gdk/gdkinput.c b/gdk/gdkinput.c index 491131ca27..444d630efc 100644 --- a/gdk/gdkinput.c +++ b/gdk/gdkinput.c @@ -147,7 +147,7 @@ gdk_input_motion_events (GdkWindow *window, coords[i].ytilt = 0.0; } - XFree(xcoords); + XFree (xcoords); return coords; } diff --git a/gdk/gdkproperty.c b/gdk/gdkproperty.c index 36e3c22024..38665ca0c4 100644 --- a/gdk/gdkproperty.c +++ b/gdk/gdkproperty.c @@ -46,12 +46,16 @@ gdk_atom_name (GdkAtom atom) if (gdk_error_code == -1) { + if (t) + XFree (t); + return NULL; } else { name = g_strdup (t); - XFree (t); + if (t) + XFree (t); return name; } @@ -95,6 +99,7 @@ gdk_property_get (GdkWindow *window, xwindow = gdk_root_window; } + ret_data = NULL; XGetWindowProperty (xdisplay, xwindow, property, offset, (length + 3) / 4, pdelete, type, &ret_prop_type, &ret_format, @@ -113,6 +118,7 @@ gdk_property_get (GdkWindow *window, if (ret_prop_type != type) { gchar *rn, *pn; + XFree (ret_data); rn = gdk_atom_name(ret_prop_type); pn = gdk_atom_name(type); diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c index f1abc01cfb..fb89a3d85e 100644 --- a/gdk/gdkselection.c +++ b/gdk/gdkselection.c @@ -109,6 +109,7 @@ gdk_selection_property_get (GdkWindow *requestor, if (private->destroyed) return 0; + t = NULL; XGetWindowProperty (private->xdisplay, private->xwindow, gdk_selection_property, 0, 0, False, AnyPropertyType, &prop_type, &prop_format, @@ -125,7 +126,11 @@ gdk_selection_property_get (GdkWindow *requestor, return 0; } - XFree (t); + if (t) + { + t = NULL; + XFree (t); + } /* Add on an extra byte to handle null termination. X guarantees that t will be 1 longer than nbytes and null terminated */ @@ -144,7 +149,8 @@ gdk_selection_property_get (GdkWindow *requestor, { *data = g_new (guchar, length); memcpy (*data, t, length); - XFree (t); + if (t) + XFree (t); return length-1; } else @@ -205,6 +211,8 @@ gdk_text_property_to_text_list (GdkAtom encoding, gint format, void gdk_free_text_list (gchar **list) { + g_return_if_fail (list != NULL); + XFreeStringList (list); } diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c index a6a8b2b134..c471424f34 100644 --- a/gdk/gdkvisual.c +++ b/gdk/gdkvisual.c @@ -163,7 +163,8 @@ gdk_visual_init (void) } } - XFree (visual_list); + if (visual_list) + XFree (visual_list); for (i = 0; i < nvisuals; i++) { diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index ad19209751..6237c780f7 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -476,7 +476,8 @@ gdk_window_foreign_new (guint32 anid) /* FIXME: This is pretty expensive. Maybe the caller should supply * the parent */ XQueryTree (gdk_display, anid, &root, &parent, &children, &nchildren); - XFree (children); + if (children) + XFree (children); private->parent = gdk_xid_table_lookup (parent); parent_private = (GdkWindowPrivate *)private->parent; @@ -1449,7 +1450,8 @@ gdk_window_get_children (GdkWindow *window) children = g_list_prepend (children, child); } - XFree (xchildren); + if (xchildren) + XFree (xchildren); } return children; @@ -1525,17 +1527,20 @@ gdk_window_add_colormap_windows (GdkWindow *window) if (window_private->destroyed) return; + old_windows = NULL; if (!XGetWMColormapWindows (toplevel_private->xdisplay, toplevel_private->xwindow, &old_windows, &count)) { - old_windows = NULL; count = 0; } for (i = 0; i < count; i++) if (old_windows[i] == window_private->xwindow) - return; + { + XFree (old_windows); + return; + } new_windows = g_new (Window, count + 1); @@ -1949,7 +1954,8 @@ gdk_window_set_icon_name (GdkWindow *window, XSetWMIconName (window_private->xdisplay, window_private->xwindow, &property); - XFree(property.value); + if (property.value) + XFree (property.value); } void diff --git a/gdk/gxid.c b/gdk/gxid.c index 40b48fa31c..190eb0678f 100644 --- a/gdk/gxid.c +++ b/gdk/gxid.c @@ -267,8 +267,9 @@ gxi_find_root_child(Display *dpy, Window w) do { w = parent; - XQueryTree(dpy,w,&root,&parent,&children,&nchildren); - if (children) XFree(children); + XQueryTree (dpy, w, &root, &parent, &children, &nchildren); + if (children) + XFree (children); } while (parent != root); diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c index 491131ca27..444d630efc 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -147,7 +147,7 @@ gdk_input_motion_events (GdkWindow *window, coords[i].ytilt = 0.0; } - XFree(xcoords); + XFree (xcoords); return coords; } diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index 36e3c22024..38665ca0c4 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -46,12 +46,16 @@ gdk_atom_name (GdkAtom atom) if (gdk_error_code == -1) { + if (t) + XFree (t); + return NULL; } else { name = g_strdup (t); - XFree (t); + if (t) + XFree (t); return name; } @@ -95,6 +99,7 @@ gdk_property_get (GdkWindow *window, xwindow = gdk_root_window; } + ret_data = NULL; XGetWindowProperty (xdisplay, xwindow, property, offset, (length + 3) / 4, pdelete, type, &ret_prop_type, &ret_format, @@ -113,6 +118,7 @@ gdk_property_get (GdkWindow *window, if (ret_prop_type != type) { gchar *rn, *pn; + XFree (ret_data); rn = gdk_atom_name(ret_prop_type); pn = gdk_atom_name(type); diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index f1abc01cfb..fb89a3d85e 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -109,6 +109,7 @@ gdk_selection_property_get (GdkWindow *requestor, if (private->destroyed) return 0; + t = NULL; XGetWindowProperty (private->xdisplay, private->xwindow, gdk_selection_property, 0, 0, False, AnyPropertyType, &prop_type, &prop_format, @@ -125,7 +126,11 @@ gdk_selection_property_get (GdkWindow *requestor, return 0; } - XFree (t); + if (t) + { + t = NULL; + XFree (t); + } /* Add on an extra byte to handle null termination. X guarantees that t will be 1 longer than nbytes and null terminated */ @@ -144,7 +149,8 @@ gdk_selection_property_get (GdkWindow *requestor, { *data = g_new (guchar, length); memcpy (*data, t, length); - XFree (t); + if (t) + XFree (t); return length-1; } else @@ -205,6 +211,8 @@ gdk_text_property_to_text_list (GdkAtom encoding, gint format, void gdk_free_text_list (gchar **list) { + g_return_if_fail (list != NULL); + XFreeStringList (list); } diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index a6a8b2b134..c471424f34 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -163,7 +163,8 @@ gdk_visual_init (void) } } - XFree (visual_list); + if (visual_list) + XFree (visual_list); for (i = 0; i < nvisuals; i++) { diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index ad19209751..6237c780f7 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -476,7 +476,8 @@ gdk_window_foreign_new (guint32 anid) /* FIXME: This is pretty expensive. Maybe the caller should supply * the parent */ XQueryTree (gdk_display, anid, &root, &parent, &children, &nchildren); - XFree (children); + if (children) + XFree (children); private->parent = gdk_xid_table_lookup (parent); parent_private = (GdkWindowPrivate *)private->parent; @@ -1449,7 +1450,8 @@ gdk_window_get_children (GdkWindow *window) children = g_list_prepend (children, child); } - XFree (xchildren); + if (xchildren) + XFree (xchildren); } return children; @@ -1525,17 +1527,20 @@ gdk_window_add_colormap_windows (GdkWindow *window) if (window_private->destroyed) return; + old_windows = NULL; if (!XGetWMColormapWindows (toplevel_private->xdisplay, toplevel_private->xwindow, &old_windows, &count)) { - old_windows = NULL; count = 0; } for (i = 0; i < count; i++) if (old_windows[i] == window_private->xwindow) - return; + { + XFree (old_windows); + return; + } new_windows = g_new (Window, count + 1); @@ -1949,7 +1954,8 @@ gdk_window_set_icon_name (GdkWindow *window, XSetWMIconName (window_private->xdisplay, window_private->xwindow, &property); - XFree(property.value); + if (property.value) + XFree (property.value); } void diff --git a/gdk/x11/gxid.c b/gdk/x11/gxid.c index 40b48fa31c..190eb0678f 100644 --- a/gdk/x11/gxid.c +++ b/gdk/x11/gxid.c @@ -267,8 +267,9 @@ gxi_find_root_child(Display *dpy, Window w) do { w = parent; - XQueryTree(dpy,w,&root,&parent,&children,&nchildren); - if (children) XFree(children); + XQueryTree (dpy, w, &root, &parent, &children, &nchildren); + if (children) + XFree (children); } while (parent != root); diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 74059250ee..2e081c1c03 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -64,8 +64,8 @@ gtk_accel_label_get_type (void) sizeof (GtkAccelLabelClass), (GtkClassInitFunc) gtk_accel_label_class_init, (GtkObjectInitFunc) gtk_accel_label_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index fc65dffe80..af5780216a 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -48,8 +48,8 @@ gtk_adjustment_get_type (void) sizeof (GtkAdjustmentClass), (GtkClassInitFunc) gtk_adjustment_class_init, (GtkObjectInitFunc) gtk_adjustment_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c index 14bf35dc8b..d29e7d749e 100644 --- a/gtk/gtkalignment.c +++ b/gtk/gtkalignment.c @@ -57,8 +57,8 @@ gtk_alignment_get_type (void) sizeof (GtkAlignmentClass), (GtkClassInitFunc) gtk_alignment_class_init, (GtkObjectInitFunc) gtk_alignment_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c index 54b543bc0b..adccf52e1b 100644 --- a/gtk/gtkarrow.c +++ b/gtk/gtkarrow.c @@ -54,8 +54,8 @@ gtk_arrow_get_type (void) sizeof (GtkArrowClass), (GtkClassInitFunc) gtk_arrow_class_init, (GtkObjectInitFunc) gtk_arrow_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 57577861c8..fe6c76a0f8 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -51,8 +51,8 @@ gtk_aspect_frame_get_type (void) sizeof (GtkAspectFrameClass), (GtkClassInitFunc) gtk_aspect_frame_class_init, (GtkObjectInitFunc) gtk_aspect_frame_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 87ae80a889..0c510095d2 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -43,8 +43,8 @@ gtk_button_box_get_type (void) sizeof (GtkButtonBoxClass), (GtkClassInitFunc) gtk_button_box_class_init, (GtkObjectInitFunc) gtk_button_box_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index 268b6faf0e..392c160de8 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -54,8 +54,8 @@ gtk_bin_get_type (void) sizeof (GtkBinClass), (GtkClassInitFunc) gtk_bin_class_init, (GtkObjectInitFunc) gtk_bin_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index ee016b8a98..4eeab67798 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -82,8 +82,8 @@ gtk_box_get_type (void) sizeof (GtkBoxClass), (GtkClassInitFunc) gtk_box_class_init, (GtkObjectInitFunc) gtk_box_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 7d617cc10a..2b8cfd3c4f 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -111,8 +111,8 @@ gtk_button_get_type (void) sizeof (GtkButtonClass), (GtkClassInitFunc) gtk_button_class_init, (GtkObjectInitFunc) gtk_button_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 7101d11428..38bc73b824 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -60,8 +60,8 @@ gtk_check_button_get_type (void) sizeof (GtkCheckButtonClass), (GtkClassInitFunc) gtk_check_button_class_init, (GtkObjectInitFunc) gtk_check_button_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 86592c3c17..e9130247ff 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -61,8 +61,8 @@ gtk_check_menu_item_get_type (void) sizeof (GtkCheckMenuItemClass), (GtkClassInitFunc) gtk_check_menu_item_class_init, (GtkObjectInitFunc) gtk_check_menu_item_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 961398a3f2..4505ea7087 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -294,8 +294,8 @@ gtk_clist_get_type (void) sizeof (GtkCListClass), (GtkClassInitFunc) gtk_clist_class_init, (GtkObjectInitFunc) gtk_clist_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index be02d6c330..e4d6681f2e 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -207,8 +207,8 @@ gtk_color_selection_get_type (void) sizeof (GtkColorSelectionClass), (GtkClassInitFunc) gtk_color_selection_class_init, (GtkObjectInitFunc) gtk_color_selection_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; @@ -1445,8 +1445,8 @@ gtk_color_selection_dialog_get_type (void) sizeof (GtkColorSelectionDialogClass), (GtkClassInitFunc) gtk_color_selection_dialog_class_init, (GtkObjectInitFunc) gtk_color_selection_dialog_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 3313374e4c..165bed40f1 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -703,8 +703,8 @@ gtk_combo_get_type (void) sizeof (GtkComboClass), (GtkClassInitFunc) gtk_combo_class_init, (GtkObjectInitFunc) gtk_combo_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; combo_type = gtk_type_unique (gtk_hbox_get_type (), &combo_info); diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 7f67645e6a..eca39a568b 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -148,8 +148,8 @@ gtk_container_get_type (void) sizeof (GtkContainerClass), (GtkClassInitFunc) gtk_container_class_init, (GtkObjectInitFunc) gtk_container_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) gtk_container_base_class_init, }; diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 47a429e022..5e001c1782 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -211,8 +211,8 @@ gtk_ctree_get_type (void) sizeof (GtkCTreeClass), (GtkClassInitFunc) gtk_ctree_class_init, (GtkObjectInitFunc) gtk_ctree_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c index 7eedea0c83..404e61e67b 100644 --- a/gtk/gtkcurve.c +++ b/gtk/gtkcurve.c @@ -65,8 +65,8 @@ gtk_curve_get_type (void) sizeof (GtkCurveClass), (GtkClassInitFunc) gtk_curve_class_init, (GtkObjectInitFunc) gtk_curve_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkdata.c b/gtk/gtkdata.c index 132839419f..e92d0e9e83 100644 --- a/gtk/gtkdata.c +++ b/gtk/gtkdata.c @@ -46,8 +46,8 @@ gtk_data_get_type (void) sizeof (GtkDataClass), (GtkClassInitFunc) gtk_data_class_init, (GtkObjectInitFunc) NULL, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index d55521ed53..670c82487f 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -41,8 +41,8 @@ gtk_dialog_get_type (void) sizeof (GtkDialogClass), (GtkClassInitFunc) gtk_dialog_class_init, (GtkObjectInitFunc) gtk_dialog_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index 903f6495cc..b6c525bb8f 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -41,8 +41,8 @@ gtk_drawing_area_get_type (void) sizeof (GtkDrawingAreaClass), (GtkClassInitFunc) gtk_drawing_area_class_init, (GtkObjectInitFunc) gtk_drawing_area_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index 163b414da4..e4bcc5230d 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -121,8 +121,8 @@ gtk_editable_get_type (void) sizeof (GtkEditableClass), (GtkClassInitFunc) gtk_editable_class_init, (GtkObjectInitFunc) gtk_editable_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 58e47aff4e..31d57151d9 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -214,8 +214,8 @@ gtk_entry_get_type (void) sizeof (GtkEntryClass), (GtkClassInitFunc) gtk_entry_class_init, (GtkObjectInitFunc) gtk_entry_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c index 56f9c166fe..d99f288ba6 100644 --- a/gtk/gtkeventbox.c +++ b/gtk/gtkeventbox.c @@ -47,8 +47,8 @@ gtk_event_box_get_type (void) sizeof (GtkEventBoxClass), (GtkClassInitFunc) gtk_event_box_class_init, (GtkObjectInitFunc) gtk_event_box_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 0f378f348c..36fc45f888 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -331,8 +331,8 @@ gtk_file_selection_get_type (void) sizeof (GtkFileSelectionClass), (GtkClassInitFunc) gtk_file_selection_class_init, (GtkObjectInitFunc) gtk_file_selection_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c index ca365f16c9..b59cb781cf 100644 --- a/gtk/gtkfixed.c +++ b/gtk/gtkfixed.c @@ -61,8 +61,8 @@ gtk_fixed_get_type (void) sizeof (GtkFixedClass), (GtkClassInitFunc) gtk_fixed_class_init, (GtkObjectInitFunc) gtk_fixed_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index aae84bbbb4..9e8b8d65bd 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -399,8 +399,8 @@ gtk_font_selection_get_type() sizeof(GtkFontSelectionClass), (GtkClassInitFunc) gtk_font_selection_class_init, (GtkObjectInitFunc) gtk_font_selection_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; @@ -3077,8 +3077,8 @@ gtk_font_selection_dialog_get_type (void) sizeof (GtkFontSelectionDialogClass), (GtkClassInitFunc) gtk_font_selection_dialog_class_init, (GtkObjectInitFunc) gtk_font_selection_dialog_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 319d53f90c..081812d73e 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -68,8 +68,8 @@ gtk_frame_get_type (void) sizeof (GtkFrameClass), (GtkClassInitFunc) gtk_frame_class_init, (GtkObjectInitFunc) gtk_frame_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c index 9542d1b1e4..787de5a428 100644 --- a/gtk/gtkgamma.c +++ b/gtk/gtkgamma.c @@ -216,8 +216,8 @@ gtk_gamma_curve_get_type (void) sizeof (GtkGammaCurveClass), (GtkClassInitFunc) gtk_gamma_curve_class_init, (GtkObjectInitFunc) gtk_gamma_curve_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 386152fcf0..de2c856694 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -93,8 +93,8 @@ gtk_handle_box_get_type (void) sizeof (GtkHandleBoxClass), (GtkClassInitFunc) gtk_handle_box_class_init, (GtkObjectInitFunc) gtk_handle_box_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c index 36d86905bd..4b9afe1ad4 100644 --- a/gtk/gtkhbbox.c +++ b/gtk/gtkhbbox.c @@ -44,8 +44,8 @@ gtk_hbutton_box_get_type (void) sizeof (GtkHButtonBoxClass), (GtkClassInitFunc) gtk_hbutton_box_class_init, (GtkObjectInitFunc) gtk_hbutton_box_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c index c7b5455f41..0dbc258019 100644 --- a/gtk/gtkhbox.c +++ b/gtk/gtkhbox.c @@ -41,8 +41,8 @@ gtk_hbox_get_type (void) sizeof (GtkHBoxClass), (GtkClassInitFunc) gtk_hbox_class_init, (GtkObjectInitFunc) gtk_hbox_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index af9c0302da..e828de2b3a 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -50,8 +50,8 @@ gtk_hpaned_get_type (void) sizeof (GtkHPanedClass), (GtkClassInitFunc) gtk_hpaned_class_init, (GtkObjectInitFunc) gtk_hpaned_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c index bbb36b0ff5..0a8b6307c5 100644 --- a/gtk/gtkhruler.c +++ b/gtk/gtkhruler.c @@ -52,8 +52,8 @@ gtk_hruler_get_type (void) sizeof (GtkHRulerClass), (GtkClassInitFunc) gtk_hruler_class_init, (GtkObjectInitFunc) gtk_hruler_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index 2ebbeed844..96ec889415 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -59,8 +59,8 @@ gtk_hscale_get_type (void) sizeof (GtkHScaleClass), (GtkClassInitFunc) gtk_hscale_class_init, (GtkObjectInitFunc) gtk_hscale_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c index 57ba99c4ef..75068c338b 100644 --- a/gtk/gtkhscrollbar.c +++ b/gtk/gtkhscrollbar.c @@ -55,8 +55,8 @@ gtk_hscrollbar_get_type (void) sizeof (GtkHScrollbarClass), (GtkClassInitFunc) gtk_hscrollbar_class_init, (GtkObjectInitFunc) gtk_hscrollbar_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c index fe0a4f09fb..ff6c7a0dee 100644 --- a/gtk/gtkhseparator.c +++ b/gtk/gtkhseparator.c @@ -39,8 +39,8 @@ gtk_hseparator_get_type (void) sizeof (GtkHSeparatorClass), (GtkClassInitFunc) gtk_hseparator_class_init, (GtkObjectInitFunc) gtk_hseparator_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index aa3e7bc13d..3f2cb73e62 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -40,8 +40,8 @@ gtk_image_get_type (void) sizeof (GtkImageClass), (GtkClassInitFunc) gtk_image_class_init, (GtkObjectInitFunc) gtk_image_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c index a109d3ec23..81aa60e7fb 100644 --- a/gtk/gtkinputdialog.c +++ b/gtk/gtkinputdialog.c @@ -141,8 +141,8 @@ gtk_input_dialog_get_type (void) sizeof (GtkInputDialogClass), (GtkClassInitFunc) gtk_input_dialog_class_init, (GtkObjectInitFunc) gtk_input_dialog_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c index 4a49e5b577..8d04731466 100644 --- a/gtk/gtkitem.c +++ b/gtk/gtkitem.c @@ -56,8 +56,8 @@ gtk_item_get_type (void) sizeof (GtkItemClass), (GtkClassInitFunc) gtk_item_class_init, (GtkObjectInitFunc) gtk_item_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 43d9888345..0a624f0605 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -162,8 +162,8 @@ gtk_item_factory_get_type (void) sizeof (GtkItemFactoryClass), (GtkClassInitFunc) gtk_item_factory_class_init, (GtkObjectInitFunc) gtk_item_factory_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 1b2bf893bd..cc5c2160ad 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -63,8 +63,8 @@ gtk_label_get_type (void) sizeof (GtkLabelClass), (GtkClassInitFunc) gtk_label_class_init, (GtkObjectInitFunc) gtk_label_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtklist.c b/gtk/gtklist.c index 9e67051e6a..9c5809712e 100644 --- a/gtk/gtklist.c +++ b/gtk/gtklist.c @@ -94,8 +94,8 @@ gtk_list_get_type (void) sizeof (GtkListClass), (GtkClassInitFunc) gtk_list_class_init, (GtkObjectInitFunc) gtk_list_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c index d019ad212a..eb19513d2f 100644 --- a/gtk/gtklistitem.c +++ b/gtk/gtklistitem.c @@ -60,8 +60,8 @@ gtk_list_item_get_type (void) sizeof (GtkListItemClass), (GtkClassInitFunc) gtk_list_item_class_init, (GtkObjectInitFunc) gtk_list_item_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 4dfa10cef2..d3cb999e12 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -79,8 +79,8 @@ gtk_menu_get_type (void) sizeof (GtkMenuClass), (GtkClassInitFunc) gtk_menu_class_init, (GtkObjectInitFunc) gtk_menu_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 0288d303dd..1983e3dd4a 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -52,8 +52,8 @@ gtk_menu_bar_get_type (void) sizeof (GtkMenuBarClass), (GtkClassInitFunc) gtk_menu_bar_class_init, (GtkObjectInitFunc) gtk_menu_bar_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 4631a51db2..50fc1d24be 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -77,8 +77,8 @@ gtk_menu_item_get_type (void) sizeof (GtkMenuItemClass), (GtkClassInitFunc) gtk_menu_item_class_init, (GtkObjectInitFunc) gtk_menu_item_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 2f3cd65aa0..bb6094cd82 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -78,8 +78,8 @@ gtk_menu_shell_get_type (void) sizeof (GtkMenuShellClass), (GtkClassInitFunc) gtk_menu_shell_class_init, (GtkObjectInitFunc) gtk_menu_shell_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c index 1c3021b018..96f1477878 100644 --- a/gtk/gtkmisc.c +++ b/gtk/gtkmisc.c @@ -53,8 +53,8 @@ gtk_misc_get_type (void) sizeof (GtkMiscClass), (GtkClassInitFunc) gtk_misc_class_init, (GtkObjectInitFunc) gtk_misc_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index c0d3a09700..858039943a 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -161,8 +161,8 @@ gtk_notebook_get_type (void) sizeof (GtkNotebookClass), (GtkClassInitFunc) gtk_notebook_class_init, (GtkObjectInitFunc) gtk_notebook_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 0fc276cb11..01a704c2d6 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -141,8 +141,8 @@ gtk_object_init_type (void) sizeof (GtkObjectClass), (GtkClassInitFunc) gtk_object_class_init, (GtkObjectInitFunc) gtk_object_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) gtk_object_base_class_init, }; diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index b90c9a83ba..7a713242e6 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -77,8 +77,8 @@ gtk_option_menu_get_type (void) sizeof (GtkOptionMenuClass), (GtkClassInitFunc) gtk_option_menu_class_init, (GtkObjectInitFunc) gtk_option_menu_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkpacker.c b/gtk/gtkpacker.c index 00e8dedd43..0be1c03c7d 100644 --- a/gtk/gtkpacker.c +++ b/gtk/gtkpacker.c @@ -167,8 +167,8 @@ gtk_packer_get_type (void) sizeof (GtkPackerClass), (GtkClassInitFunc) gtk_packer_class_init, (GtkObjectInitFunc) gtk_packer_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 46a00ce3a9..ac8209ba16 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -54,8 +54,8 @@ gtk_paned_get_type (void) sizeof (GtkPanedClass), (GtkClassInitFunc) gtk_paned_class_init, (GtkObjectInitFunc) gtk_paned_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index 52bdfc46cd..7a3cfb6848 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -42,8 +42,8 @@ gtk_pixmap_get_type (void) sizeof (GtkPixmapClass), (GtkClassInitFunc) gtk_pixmap_class_init, (GtkObjectInitFunc) gtk_pixmap_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c index 402d9634f5..2aa3d0b13c 100644 --- a/gtk/gtkpreview.c +++ b/gtk/gtkpreview.c @@ -139,8 +139,8 @@ gtk_preview_get_type (void) sizeof (GtkPreviewClass), (GtkClassInitFunc) gtk_preview_class_init, (GtkObjectInitFunc) gtk_preview_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index c2677f4124..c82ed8f096 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -48,8 +48,8 @@ gtk_progress_bar_get_type (void) sizeof (GtkProgressBarClass), (GtkClassInitFunc) gtk_progress_bar_class_init, (GtkObjectInitFunc) gtk_progress_bar_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 0d9bcf079d..ee1a80f679 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -60,8 +60,8 @@ gtk_radio_button_get_type (void) sizeof (GtkRadioButtonClass), (GtkClassInitFunc) gtk_radio_button_class_init, (GtkObjectInitFunc) gtk_radio_button_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index ab7fbce37a..c6cb6d6b2b 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -41,8 +41,8 @@ gtk_radio_menu_item_get_type (void) sizeof (GtkRadioMenuItemClass), (GtkClassInitFunc) gtk_radio_menu_item_class_init, (GtkObjectInitFunc) gtk_radio_menu_item_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 5f9b2459df..ae79bb6ef5 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -95,8 +95,8 @@ gtk_range_get_type (void) sizeof (GtkRangeClass), (GtkClassInitFunc) gtk_range_class_init, (GtkObjectInitFunc) gtk_range_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index 42f3f274e2..c43d7ed9d7 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -54,8 +54,8 @@ gtk_ruler_get_type (void) sizeof (GtkRulerClass), (GtkClassInitFunc) gtk_ruler_class_init, (GtkObjectInitFunc) gtk_ruler_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 298ede58f3..7592f1aecf 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -46,8 +46,8 @@ gtk_scale_get_type (void) sizeof (GtkScaleClass), (GtkClassInitFunc) gtk_scale_class_init, (GtkObjectInitFunc) gtk_scale_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index f738a44e72..cd8438be94 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -35,8 +35,8 @@ gtk_scrollbar_get_type (void) sizeof (GtkScrollbarClass), (GtkClassInitFunc) gtk_scrollbar_class_init, (GtkObjectInitFunc) gtk_scrollbar_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index d6fd1f66f1..82fb86d64e 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -65,8 +65,8 @@ gtk_scrolled_window_get_type (void) sizeof (GtkScrolledWindowClass), (GtkClassInitFunc) gtk_scrolled_window_class_init, (GtkObjectInitFunc) gtk_scrolled_window_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c index dec87bb1ef..8aa612391e 100644 --- a/gtk/gtkseparator.c +++ b/gtk/gtkseparator.c @@ -37,8 +37,8 @@ gtk_separator_get_type (void) sizeof (GtkSeparatorClass), (GtkClassInitFunc) gtk_separator_class_init, (GtkObjectInitFunc) gtk_separator_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 0134fe51bc..014c5dde73 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -107,8 +107,8 @@ gtk_spin_button_get_type (void) sizeof (GtkSpinButtonClass), (GtkClassInitFunc) gtk_spin_button_class_init, (GtkObjectInitFunc) gtk_spin_button_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index 86429a53df..a953acb15a 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -61,8 +61,8 @@ gtk_statusbar_get_type (void) sizeof (GtkStatusbarClass), (GtkClassInitFunc) gtk_statusbar_class_init, (GtkObjectInitFunc) gtk_statusbar_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtktable.c b/gtk/gtktable.c index 6ffbeaeb77..cae41a0c60 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -106,8 +106,8 @@ gtk_table_get_type (void) sizeof (GtkTableClass), (GtkClassInitFunc) gtk_table_class_init, (GtkObjectInitFunc) gtk_table_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtktext.c b/gtk/gtktext.c index fac367331f..cacbf181ce 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -459,8 +459,8 @@ gtk_text_get_type (void) sizeof (GtkTextClass), (GtkClassInitFunc) gtk_text_class_init, (GtkObjectInitFunc) gtk_text_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c index 732d82e168..803c65f73d 100644 --- a/gtk/gtktipsquery.c +++ b/gtk/gtktipsquery.c @@ -98,8 +98,8 @@ gtk_tips_query_get_type (void) sizeof (GtkTipsQueryClass), (GtkClassInitFunc) gtk_tips_query_class_init, (GtkObjectInitFunc) gtk_tips_query_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index 1a975da151..ef8bb82991 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -71,8 +71,8 @@ gtk_toggle_button_get_type (void) sizeof (GtkToggleButtonClass), (GtkClassInitFunc) gtk_toggle_button_class_init, (GtkObjectInitFunc) gtk_toggle_button_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index cc9f25e0ee..6bb07e1fe3 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -90,8 +90,8 @@ gtk_toolbar_get_type (void) sizeof (GtkToolbarClass), (GtkClassInitFunc) gtk_toolbar_class_init, (GtkObjectInitFunc) gtk_toolbar_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index 044a6011fd..4800af1d8d 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -63,8 +63,8 @@ gtk_tooltips_get_type (void) sizeof (GtkTooltipsClass), (GtkClassInitFunc) gtk_tooltips_class_init, (GtkObjectInitFunc) gtk_tooltips_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtktree.c b/gtk/gtktree.c index 149389e653..de464300ae 100644 --- a/gtk/gtktree.c +++ b/gtk/gtktree.c @@ -88,8 +88,8 @@ gtk_tree_get_type (void) sizeof (GtkTreeClass), (GtkClassInitFunc) gtk_tree_class_init, (GtkObjectInitFunc) gtk_tree_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c index 4aefd26ed8..2f18a295df 100644 --- a/gtk/gtktreeitem.c +++ b/gtk/gtktreeitem.c @@ -106,8 +106,8 @@ gtk_tree_item_get_type (void) sizeof (GtkTreeItemClass), (GtkClassInitFunc) gtk_tree_item_class_init, (GtkObjectInitFunc) gtk_tree_item_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index 99aedaf5e9..271c8dc092 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -43,8 +43,8 @@ gtk_vbutton_box_get_type (void) sizeof (GtkVButtonBoxClass), (GtkClassInitFunc) gtk_vbutton_box_class_init, (GtkObjectInitFunc) gtk_vbutton_box_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c index 958d821015..be40bdb7ca 100644 --- a/gtk/gtkvbox.c +++ b/gtk/gtkvbox.c @@ -41,8 +41,8 @@ gtk_vbox_get_type (void) sizeof (GtkVBoxClass), (GtkClassInitFunc) gtk_vbox_class_init, (GtkObjectInitFunc) gtk_vbox_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 266e69144f..7cea71787c 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -60,8 +60,8 @@ gtk_viewport_get_type (void) sizeof (GtkViewportClass), (GtkClassInitFunc) gtk_viewport_class_init, (GtkObjectInitFunc) gtk_viewport_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index f5b24dd79c..32bebd5f40 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -50,8 +50,8 @@ gtk_vpaned_get_type (void) sizeof (GtkVPanedClass), (GtkClassInitFunc) gtk_vpaned_class_init, (GtkObjectInitFunc) gtk_vpaned_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c index 7099fc46cc..f19e5eab29 100644 --- a/gtk/gtkvruler.c +++ b/gtk/gtkvruler.c @@ -52,8 +52,8 @@ gtk_vruler_get_type (void) sizeof (GtkVRulerClass), (GtkClassInitFunc) gtk_vruler_class_init, (GtkObjectInitFunc) gtk_vruler_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index 3b08063e55..5fecac3564 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -60,8 +60,8 @@ gtk_vscale_get_type (void) sizeof (GtkVScaleClass), (GtkClassInitFunc) gtk_vscale_class_init, (GtkObjectInitFunc) gtk_vscale_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c index d1eab8e752..52ab2d25ef 100644 --- a/gtk/gtkvscrollbar.c +++ b/gtk/gtkvscrollbar.c @@ -54,8 +54,8 @@ gtk_vscrollbar_get_type (void) sizeof (GtkVScrollbarClass), (GtkClassInitFunc) gtk_vscrollbar_class_init, (GtkObjectInitFunc) gtk_vscrollbar_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c index 85556e6569..6ebaef79b4 100644 --- a/gtk/gtkvseparator.c +++ b/gtk/gtkvseparator.c @@ -39,8 +39,8 @@ gtk_vseparator_get_type (void) sizeof (GtkVSeparatorClass), (GtkClassInitFunc) gtk_vseparator_class_init, (GtkObjectInitFunc) gtk_vseparator_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 680dabac18..a0a0bcebe0 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -269,8 +269,8 @@ gtk_widget_get_type (void) sizeof (GtkWidgetClass), (GtkClassInitFunc) gtk_widget_class_init, (GtkObjectInitFunc) gtk_widget_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index a62f04737a..b5bb745c0f 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -122,8 +122,8 @@ gtk_window_get_type (void) sizeof (GtkWindowClass), (GtkClassInitFunc) gtk_window_class_init, (GtkObjectInitFunc) gtk_window_init, - /* reversed_1 */ NULL, - /* reversed_2 */ NULL, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; |