diff options
168 files changed, 200 insertions, 220 deletions
@@ -1,29 +1,13 @@ 2005-08-31 Matthias Clasen <mclasen@redhat.com> - * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_type): - * gdk/x11/gdkscreen-x11.c (_gdk_screen_x11_get_type): - * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_impl_x11_get_type): - * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_get_type): - * gdk/x11/gdkinput.c (gdk_device_get_type): - * gdk/x11/gdkimage-x11.c (gdk_image_get_type): - * gdk/x11/gdkgc-x11.c (_gdk_gc_x11_get_type): - * gdk/x11/gdkdrawable-x11.c (_gdk_drawable_impl_x11_get_type): - * gdk/x11/gdkdnd-x11.c (gdk_drag_context_get_type): - * gdk/x11/gdkdisplay-x11.c (_gdk_display_x11_get_type): - * gdk/x11/gdkcolor-x11.c (gdk_colormap_get_type): - * gdk/gdkwindow.c (gdk_window_object_get_type): - * gdk/gdkscreen.c (gdk_screen_get_type): - * gdk/gdkrectangle.c (gdk_rectangle_get_type): - * gdk/gdkpixmap.c (gdk_pixmap_get_type): - * gdk/gdkkeys.c (gdk_keymap_get_type): - * gdk/gdkfont.c (gdk_font_get_type): - * gdk/gdkevents.c (gdk_event_get_type): - * gdk/gdkdraw.c (gdk_drawable_get_type): - * gdk/gdkdisplaymanager.c (gdk_display_manager_get_type): - * gdk/gdkdisplay.c (gdk_display_get_type): - * gdk/gdkcursor.c (gdk_cursor_get_type): - * gdk/gdkcolor.c (gdk_color_get_type): Intern type names before - registering the type to avoid unnecessary copies. + * gdk/Makefile.am: + * gtk/Makefile.am: Intern type names in code generated by + glib-mkenums, too. + + * gtk/*.c: + * gdk/x11/*.c: + * gdk/*.c: Intern type names before registering the type to avoid + unnecessary copies. * configure.in: Require GLib 2.9.0 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fbf0b3418..cfec62bc8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,29 +1,13 @@ 2005-08-31 Matthias Clasen <mclasen@redhat.com> - * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_type): - * gdk/x11/gdkscreen-x11.c (_gdk_screen_x11_get_type): - * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_impl_x11_get_type): - * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_get_type): - * gdk/x11/gdkinput.c (gdk_device_get_type): - * gdk/x11/gdkimage-x11.c (gdk_image_get_type): - * gdk/x11/gdkgc-x11.c (_gdk_gc_x11_get_type): - * gdk/x11/gdkdrawable-x11.c (_gdk_drawable_impl_x11_get_type): - * gdk/x11/gdkdnd-x11.c (gdk_drag_context_get_type): - * gdk/x11/gdkdisplay-x11.c (_gdk_display_x11_get_type): - * gdk/x11/gdkcolor-x11.c (gdk_colormap_get_type): - * gdk/gdkwindow.c (gdk_window_object_get_type): - * gdk/gdkscreen.c (gdk_screen_get_type): - * gdk/gdkrectangle.c (gdk_rectangle_get_type): - * gdk/gdkpixmap.c (gdk_pixmap_get_type): - * gdk/gdkkeys.c (gdk_keymap_get_type): - * gdk/gdkfont.c (gdk_font_get_type): - * gdk/gdkevents.c (gdk_event_get_type): - * gdk/gdkdraw.c (gdk_drawable_get_type): - * gdk/gdkdisplaymanager.c (gdk_display_manager_get_type): - * gdk/gdkdisplay.c (gdk_display_get_type): - * gdk/gdkcursor.c (gdk_cursor_get_type): - * gdk/gdkcolor.c (gdk_color_get_type): Intern type names before - registering the type to avoid unnecessary copies. + * gdk/Makefile.am: + * gtk/Makefile.am: Intern type names in code generated by + glib-mkenums, too. + + * gtk/*.c: + * gdk/x11/*.c: + * gdk/*.c: Intern type names before registering the type to avoid + unnecessary copies. * configure.in: Require GLib 2.9.0 diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index de7eb386a..94b9ce539 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,5 +1,8 @@ 2005-08-31 Matthias Clasen <mclasen@redhat.com> + * Makefile.am (gdk-pixbuf-enum-types.c): Intern type + names in code generated by glib-mkenums, too. + * io-ani-animation.c (gdk_pixbuf_ani_anim_iter_get_type) (gdk_pixbuf_ani_anim_get_type): * io-gif-animation.c (gdk_pixbuf_gif_anim_get_type) diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 1a5de6fc0..b66a468af 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -393,7 +393,7 @@ gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) Makefile --ftail "\n#define __GDK_PIXBUF_ENUM_TYPES_C__\n#include \"gdk-pixbuf-aliasdef.c\"" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ $(gdk_pixbuf_headers)) > gdk-pixbuf-enum-types.c # diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 0c1d650c0..6db73bd08 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -250,7 +250,7 @@ gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile --ftail "\n#define __GDK_ENUM_TYPES_C__\n#include \"gdkaliasdef.c\"\n" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ $(gdk_public_h_sources) ) > xgen-getc \ && cp xgen-getc gdkenumtypes.c \ && rm -f xgen-getc diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 4ea8eda68..8998eef89 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -658,7 +658,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ $(gtk_public_h_sources) ) > xgen-gtbc \ && cp xgen-gtbc gtktypebuiltins.c \ && rm -f xgen-gtbc diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index b65a7ff45..4ca34fd83 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -78,7 +78,7 @@ gtk_accel_group_get_type (void) (GInstanceInitFunc) gtk_accel_group_init, }; - object_type = g_type_register_static (G_TYPE_OBJECT, "GtkAccelGroup", + object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkAccelGroup"), &object_info, 0); } diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index cafd02201..ffd8056f3 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -85,7 +85,7 @@ gtk_accel_label_get_type (void) }; accel_label_type = - g_type_register_static (GTK_TYPE_LABEL, "GtkAccelLabel", + g_type_register_static (GTK_TYPE_LABEL, g_intern_static_string ("GtkAccelLabel"), &accel_label_info, 0); } diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c index c1e772ab8..e39d382f1 100644 --- a/gtk/gtkaccessible.c +++ b/gtk/gtkaccessible.c @@ -49,7 +49,7 @@ gtk_accessible_get_type (void) }; accessible_type = - g_type_register_static (ATK_TYPE_OBJECT, "GtkAccessible", + g_type_register_static (ATK_TYPE_OBJECT, g_intern_static_string ("GtkAccessible"), &accessible_info, 0); } diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index ed893edac..8b694fe39 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -132,7 +132,7 @@ gtk_action_get_type (void) }; type = g_type_register_static (G_TYPE_OBJECT, - "GtkAction", + g_intern_static_string ("GtkAction"), &type_info, 0); } return type; diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 41f4e2590..2554dc0d0 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -106,7 +106,7 @@ gtk_action_group_get_type (void) (GInstanceInitFunc) gtk_action_group_init, }; - type = g_type_register_static (G_TYPE_OBJECT, "GtkActionGroup", + type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkActionGroup"), &type_info, 0); } diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index 70b43b35c..bc5f8064b 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -85,7 +85,7 @@ gtk_adjustment_get_type (void) }; adjustment_type = - g_type_register_static (GTK_TYPE_OBJECT, "GtkAdjustment", + g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkAdjustment"), &adjustment_info, 0); } diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c index 25aa56f38..ec00ac586 100644 --- a/gtk/gtkalignment.c +++ b/gtk/gtkalignment.c @@ -91,7 +91,7 @@ gtk_alignment_get_type (void) (GInstanceInitFunc) gtk_alignment_init, }; - alignment_type = g_type_register_static (GTK_TYPE_BIN, "GtkAlignment", + alignment_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkAlignment"), &alignment_info, 0); } diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c index 350b40412..60f3723c3 100644 --- a/gtk/gtkarrow.c +++ b/gtk/gtkarrow.c @@ -76,7 +76,7 @@ gtk_arrow_get_type (void) (GInstanceInitFunc) gtk_arrow_init, }; - arrow_type = g_type_register_static (GTK_TYPE_MISC, "GtkArrow", + arrow_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkArrow"), &arrow_info, 0); } diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 335325770..59fb04282 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -82,7 +82,7 @@ gtk_aspect_frame_get_type (void) }; aspect_frame_type = - g_type_register_static (GTK_TYPE_FRAME, "GtkAspectFrame", + g_type_register_static (GTK_TYPE_FRAME, g_intern_static_string ("GtkAspectFrame"), &aspect_frame_info, 0); } diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 7ced719f3..088a2be40 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -89,7 +89,7 @@ gtk_button_box_get_type (void) }; button_box_type = - g_type_register_static (GTK_TYPE_BOX, "GtkButtonBox", + g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkButtonBox"), &button_box_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index a6499b3a3..073c90956 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -66,7 +66,7 @@ gtk_bin_get_type (void) NULL, /* value_table */ }; - bin_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkBin", + bin_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkBin"), &bin_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 8d3acc082..a70ccd7df 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -100,7 +100,7 @@ gtk_box_get_type (void) NULL, /* value_table */ }; - box_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkBox", + box_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkBox"), &box_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 8e961564a..6f93343dd 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -165,7 +165,7 @@ gtk_button_get_type (void) (GInstanceInitFunc) gtk_button_init, }; - button_type = g_type_register_static (GTK_TYPE_BIN, "GtkButton", + button_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkButton"), &button_info, 0); } diff --git a/gtk/gtkcelleditable.c b/gtk/gtkcelleditable.c index f18612340..7400ec775 100644 --- a/gtk/gtkcelleditable.c +++ b/gtk/gtkcelleditable.c @@ -46,7 +46,7 @@ gtk_cell_editable_get_type (void) }; cell_editable_type = - g_type_register_static (G_TYPE_INTERFACE, "GtkCellEditable", + g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkCellEditable"), &cell_editable_info, 0); g_type_interface_add_prerequisite (cell_editable_type, GTK_TYPE_WIDGET); diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c index ef4629bab..f39bf9d68 100644 --- a/gtk/gtkcelllayout.c +++ b/gtk/gtkcelllayout.c @@ -42,7 +42,7 @@ gtk_cell_layout_get_type (void) }; cell_layout_type = - g_type_register_static (G_TYPE_INTERFACE, "GtkCellLayout", + g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkCellLayout"), &cell_layout_info, 0); g_type_interface_add_prerequisite (cell_layout_type, G_TYPE_OBJECT); diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 596f6715f..4df4c4c23 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -97,7 +97,7 @@ gtk_cell_renderer_get_type (void) NULL, /* value_table */ }; - cell_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkCellRenderer", + cell_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkCellRenderer"), &cell_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c index 076042894..0aad2d8aa 100644 --- a/gtk/gtkcellrendererpixbuf.c +++ b/gtk/gtkcellrendererpixbuf.c @@ -107,7 +107,7 @@ gtk_cell_renderer_pixbuf_get_type (void) }; cell_pixbuf_type = - g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererPixbuf", + g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererPixbuf"), &cell_pixbuf_info, 0); } diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 343a4895f..26ee3eb49 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -171,7 +171,7 @@ gtk_cell_renderer_text_get_type (void) }; cell_text_type = - g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererText", + g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererText"), &cell_text_info, 0); } diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c index c8f204a07..3ccd6f867 100644 --- a/gtk/gtkcellrenderertoggle.c +++ b/gtk/gtkcellrenderertoggle.c @@ -106,7 +106,7 @@ gtk_cell_renderer_toggle_get_type (void) }; cell_toggle_type = - g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererToggle", + g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererToggle"), &cell_toggle_info, 0); } diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 29ae5894b..047fbc794 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -149,7 +149,7 @@ gtk_cell_view_get_type (void) NULL }; - cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCellView", + cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkCellView"), &cell_view_info, 0); g_type_add_interface_static (cell_view_type, GTK_TYPE_CELL_LAYOUT, diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 945001e7b..2ee76f97c 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -75,7 +75,7 @@ gtk_check_button_get_type (void) }; check_button_type = - g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, "GtkCheckButton", + g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, g_intern_static_string ("GtkCheckButton"), &check_button_info, 0); } diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 24a49ece4..91788ab46 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -90,7 +90,7 @@ gtk_check_menu_item_get_type (void) }; check_menu_item_type = - g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkCheckMenuItem", + g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkCheckMenuItem"), &check_menu_item_info, 0); } diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index 2a9c79a03..72ed7cc55 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -160,7 +160,7 @@ gtk_clipboard_get_type (void) (GInstanceInitFunc) NULL, }; - clipboard_type = g_type_register_static (G_TYPE_OBJECT, "GtkClipboard", + clipboard_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkClipboard"), &clipboard_info, 0); } diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 547b2496e..883939c28 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -488,6 +488,7 @@ gtk_clist_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkCList"); clist_type = gtk_type_unique (GTK_TYPE_CONTAINER, &clist_info); } diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 6ade7cefa..38779da3c 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -159,7 +159,7 @@ gtk_color_button_get_type (void) }; color_button_type = - g_type_register_static (GTK_TYPE_BUTTON, "GtkColorButton", + g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkColorButton"), &color_button_info, 0); } diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 92bd24f9f..fb130a808 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1837,7 +1837,7 @@ gtk_color_selection_get_type (void) }; color_selection_type = - g_type_register_static (GTK_TYPE_VBOX, "GtkColorSelection", + g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkColorSelection"), &color_selection_info, 0); } diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c index 5591bc02b..f008c2976 100644 --- a/gtk/gtkcolorseldialog.c +++ b/gtk/gtkcolorseldialog.c @@ -65,7 +65,7 @@ gtk_color_selection_dialog_get_type (void) }; color_selection_dialog_type = - g_type_register_static (GTK_TYPE_DIALOG, "GtkColorSelectionDialog", + g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkColorSelectionDialog"), &colorsel_diag_info, 0); } diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 7647b4853..0468049a3 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -1042,7 +1042,7 @@ gtk_combo_get_type (void) (GInstanceInitFunc) gtk_combo_init, }; - combo_type = g_type_register_static (GTK_TYPE_HBOX, "GtkCombo", + combo_type = g_type_register_static (GTK_TYPE_HBOX, g_intern_static_string ("GtkCombo"), &combo_info, 0); } diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 46deea972..3b2f52a13 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -462,7 +462,7 @@ gtk_combo_box_get_type (void) }; combo_box_type = g_type_register_static (GTK_TYPE_BIN, - "GtkComboBox", + g_intern_static_string ("GtkComboBox"), &combo_box_info, 0); diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index c3f000ad1..01d5e4c03 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -90,7 +90,7 @@ gtk_combo_box_entry_get_type (void) }; combo_box_entry_type = g_type_register_static (GTK_TYPE_COMBO_BOX, - "GtkComboBoxEntry", + g_intern_static_string ("GtkComboBoxEntry"), &combo_box_entry_info, 0); } diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 995f904c1..71d791a36 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -135,7 +135,7 @@ gtk_container_get_type (void) }; container_type = - g_type_register_static (GTK_TYPE_WIDGET, "GtkContainer", + g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkContainer"), &container_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 2cf10aaea..c96dbd3b6 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -342,6 +342,7 @@ gtk_ctree_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkCTree"); ctree_type = gtk_type_unique (GTK_TYPE_CLIST, &ctree_info); } diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c index 5eb26e9d0..bb61d39ec 100644 --- a/gtk/gtkcurve.c +++ b/gtk/gtkcurve.c @@ -100,7 +100,7 @@ gtk_curve_get_type (void) (GInstanceInitFunc) gtk_curve_init, }; - curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, "GtkCurve", + curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, g_intern_static_string ("GtkCurve"), &curve_info, 0); } return curve_type; diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 21e463c13..13509d303 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -114,7 +114,7 @@ gtk_dialog_get_type (void) (GInstanceInitFunc) gtk_dialog_init, }; - dialog_type = g_type_register_static (GTK_TYPE_WINDOW, "GtkDialog", + dialog_type = g_type_register_static (GTK_TYPE_WINDOW, g_intern_static_string ("GtkDialog"), &dialog_info, 0); } diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index edfab9b5c..bd4b68a62 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -58,7 +58,7 @@ gtk_drawing_area_get_type (void) }; drawing_area_type = - g_type_register_static (GTK_TYPE_WIDGET, "GtkDrawingArea", + g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkDrawingArea"), &drawing_area_info, 0); } diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index 80473c1e6..53a40f70c 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -49,7 +49,7 @@ gtk_editable_get_type (void) NULL, /* base_finalize */ }; - editable_type = g_type_register_static (G_TYPE_INTERFACE, "GtkEditable", + editable_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkEditable"), &editable_info, 0); } diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index c4757c0d6..1c3fc1cd4 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -390,7 +390,7 @@ gtk_entry_get_type (void) NULL /* interface_data */ }; - entry_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkEntry", + entry_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkEntry"), &entry_info, 0); g_type_add_interface_static (entry_type, diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 258356f36..f2857a7b2 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -171,7 +171,7 @@ gtk_entry_completion_get_type (void) }; entry_completion_type = - g_type_register_static (G_TYPE_OBJECT, "GtkEntryCompletion", + g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkEntryCompletion"), &entry_completion_info, 0); g_type_add_interface_static (entry_completion_type, diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c index 8e22ff632..a534d7be0 100644 --- a/gtk/gtkeventbox.c +++ b/gtk/gtkeventbox.c @@ -90,7 +90,7 @@ gtk_event_box_get_type (void) (GInstanceInitFunc) gtk_event_box_init, }; - event_box_type = g_type_register_static (GTK_TYPE_BIN, "GtkEventBox", + event_box_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkEventBox"), &event_box_info, 0); } diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index c3d168c78..23cd1fa13 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -142,7 +142,7 @@ gtk_expander_get_type (void) }; expander_type = g_type_register_static (GTK_TYPE_BIN, - "GtkExpander", + g_intern_static_string ("GtkExpander"), &expander_info, 0); } diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 18040f8e1..c662e43da 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -48,7 +48,7 @@ gtk_file_chooser_get_type (void) }; file_chooser_type = g_type_register_static (G_TYPE_INTERFACE, - "GtkFileChooser", + g_intern_static_string ("GtkFileChooser"), &file_chooser_info, 0); g_type_interface_add_prerequisite (file_chooser_type, GTK_TYPE_WIDGET); diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 2bed6802a..5ca14371e 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -584,7 +584,7 @@ _gtk_file_chooser_default_get_type (void) NULL /* interface_data */ }; - file_chooser_default_type = g_type_register_static (GTK_TYPE_VBOX, "GtkFileChooserDefault", + file_chooser_default_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFileChooserDefault"), &file_chooser_default_info, 0); g_type_add_interface_static (file_chooser_default_type, diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 968795a80..3377d30d8 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -97,7 +97,7 @@ gtk_file_chooser_dialog_get_type (void) NULL /* interface_data */ }; - file_chooser_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkFileChooserDialog", + file_chooser_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFileChooserDialog"), &file_chooser_dialog_info, 0); g_type_add_interface_static (file_chooser_dialog_type, GTK_TYPE_FILE_CHOOSER, diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c index 5c68f04ce..dc114905b 100644 --- a/gtk/gtkfilechooserembed.c +++ b/gtk/gtkfilechooserembed.c @@ -138,7 +138,7 @@ _gtk_file_chooser_embed_get_type (void) }; file_chooser_embed_type = g_type_register_static (G_TYPE_INTERFACE, - "GtkFileChooserEmbed", + g_intern_static_string ("GtkFileChooserEmbed"), &file_chooser_embed_info, 0); g_type_interface_add_prerequisite (file_chooser_embed_type, GTK_TYPE_WIDGET); diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index 4967832b9..02dcd4081 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -134,7 +134,7 @@ _gtk_file_chooser_entry_get_type (void) }; - file_chooser_entry_type = g_type_register_static (GTK_TYPE_ENTRY, "GtkFileChooserEntry", + file_chooser_entry_type = g_type_register_static (GTK_TYPE_ENTRY, g_intern_static_string ("GtkFileChooserEntry"), &file_chooser_entry_info, 0); g_type_add_interface_static (file_chooser_entry_type, GTK_TYPE_EDITABLE, diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 29a0a3a7e..d6dd6696d 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -87,7 +87,7 @@ gtk_file_chooser_widget_get_type (void) NULL /* interface_data */ }; - file_chooser_widget_type = g_type_register_static (GTK_TYPE_VBOX, "GtkFileChooserWidget", + file_chooser_widget_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFileChooserWidget"), &file_chooser_widget_info, 0); g_type_add_interface_static (file_chooser_widget_type, diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index 936616191..e45900f33 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -103,7 +103,7 @@ gtk_file_filter_get_type (void) NULL /* init */ }; - file_filter_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkFileFilter", + file_filter_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkFileFilter"), &file_filter_info, 0); } diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index e88832cd6..108c2795a 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -528,7 +528,7 @@ gtk_file_selection_get_type (void) }; file_selection_type = - g_type_register_static (GTK_TYPE_DIALOG, "GtkFileSelection", + g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFileSelection"), &filesel_info, 0); } diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 2b2d27558..f23d9f386 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -59,7 +59,7 @@ gtk_file_info_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkFileInfo", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkFileInfo"), (GBoxedCopyFunc) gtk_file_info_copy, (GBoxedFreeFunc) gtk_file_info_free); @@ -269,7 +269,7 @@ gtk_file_system_get_type (void) }; file_system_type = g_type_register_static (G_TYPE_INTERFACE, - "GtkFileSystem", + g_intern_static_string ("GtkFileSystem"), &file_system_info, 0); g_type_interface_add_prerequisite (file_system_type, G_TYPE_OBJECT); @@ -843,7 +843,7 @@ gtk_file_folder_get_type (void) }; file_folder_type = g_type_register_static (G_TYPE_INTERFACE, - "GtkFileFolder", + g_intern_static_string ("GtkFileFolder"), &file_folder_info, 0); g_type_interface_add_prerequisite (file_folder_type, G_TYPE_OBJECT); @@ -976,7 +976,7 @@ gtk_file_path_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkFilePath", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkFilePath"), (GBoxedCopyFunc) gtk_file_path_real_copy, (GBoxedFreeFunc) gtk_file_path_real_free); diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 54676bd24..2b1c5b4dc 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -233,7 +233,7 @@ _gtk_file_system_model_get_type (void) }; file_system_model_type = g_type_register_static (G_TYPE_OBJECT, - "GtkFileSystemModel", + g_intern_static_string ("GtkFileSystemModel"), &file_system_model_info, 0); g_type_add_interface_static (file_system_model_type, GTK_TYPE_TREE_MODEL, diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 403b52129..64ebca3a7 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -270,7 +270,7 @@ gtk_file_system_unix_get_type (void) }; file_system_unix_type = g_type_register_static (G_TYPE_OBJECT, - "GtkFileSystemUnix", + g_intern_static_string ("GtkFileSystemUnix"), &file_system_unix_info, 0); g_type_add_interface_static (file_system_unix_type, GTK_TYPE_FILE_SYSTEM, @@ -1746,7 +1746,7 @@ gtk_file_folder_unix_get_type (void) }; file_folder_unix_type = g_type_register_static (G_TYPE_OBJECT, - "GtkFileFolderUnix", + g_intern_static_string ("GtkFileFolderUnix"), &file_folder_unix_info, 0); g_type_add_interface_static (file_folder_unix_type, GTK_TYPE_FILE_FOLDER, diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index a6c3055bf..d5c7674a7 100644 --- a/gtk/gtkfilesystemwin32.c +++ b/gtk/gtkfilesystemwin32.c @@ -223,7 +223,7 @@ gtk_file_system_win32_get_type (void) }; file_system_win32_type = g_type_register_static (G_TYPE_OBJECT, - "GtkFileSystemWin32", + g_intern_static_string ("GtkFileSystemWin32"), &file_system_win32_info, 0); g_type_add_interface_static (file_system_win32_type, GTK_TYPE_FILE_SYSTEM, @@ -1342,7 +1342,7 @@ gtk_file_folder_win32_get_type (void) }; file_folder_win32_type = g_type_register_static (G_TYPE_OBJECT, - "GtkFileFolderWin32", + g_intern_static_string ("GtkFileFolderWin32"), &file_folder_win32_info, 0); g_type_add_interface_static (file_folder_win32_type, GTK_TYPE_FILE_FOLDER, diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c index ffe06c36b..0fbcfdfa2 100644 --- a/gtk/gtkfixed.c +++ b/gtk/gtkfixed.c @@ -87,7 +87,7 @@ gtk_fixed_get_type (void) (GInstanceInitFunc) gtk_fixed_init, }; - fixed_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkFixed", + fixed_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkFixed"), &fixed_info, 0); } diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index 6773d184f..4e437ed21 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -135,7 +135,7 @@ gtk_font_button_get_type (void) }; font_button_type = - g_type_register_static (GTK_TYPE_BUTTON, "GtkFontButton", + g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkFontButton"), &font_button_info, 0); } diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 6e58b220e..1a752e72d 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -190,7 +190,7 @@ gtk_font_selection_get_type (void) }; font_selection_type = - g_type_register_static (GTK_TYPE_VBOX, "GtkFontSelection", + g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFontSelection"), &fontsel_type_info, 0); } @@ -1322,7 +1322,7 @@ gtk_font_selection_dialog_get_type (void) }; font_selection_dialog_type = - g_type_register_static (GTK_TYPE_DIALOG, "GtkFontSelectionDialog", + g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFontSelectionDialog"), &fontsel_diag_info, 0); } diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 36c9c1c7c..7dcee079d 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -99,7 +99,7 @@ gtk_frame_get_type (void) (GInstanceInitFunc) gtk_frame_init, }; - frame_type = g_type_register_static (GTK_TYPE_BIN, "GtkFrame", + frame_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkFrame"), &frame_info, 0); } diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c index fa2f94856..2574d209f 100644 --- a/gtk/gtkgamma.c +++ b/gtk/gtkgamma.c @@ -233,7 +233,7 @@ gtk_gamma_curve_get_type (void) (GInstanceInitFunc) gtk_gamma_curve_init, }; - gamma_curve_type = g_type_register_static (GTK_TYPE_VBOX, "GtkGammaCurve", + gamma_curve_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkGammaCurve"), &gamma_curve_info, 0); } return gamma_curve_type; diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index f8c4e899a..4e506fb12 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -170,7 +170,7 @@ gtk_handle_box_get_type (void) (GInstanceInitFunc) gtk_handle_box_init, }; - handle_box_type = g_type_register_static (GTK_TYPE_BIN, "GtkHandleBox", + handle_box_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkHandleBox"), &handle_box_info, 0); } diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c index 880dcdf37..9469f6c37 100644 --- a/gtk/gtkhbbox.c +++ b/gtk/gtkhbbox.c @@ -60,7 +60,7 @@ gtk_hbutton_box_get_type (void) }; hbutton_box_type = - g_type_register_static (GTK_TYPE_BUTTON_BOX, "GtkHButtonBox", + g_type_register_static (GTK_TYPE_BUTTON_BOX, g_intern_static_string ("GtkHButtonBox"), &hbutton_box_info, 0); } diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c index 5b3c38bd0..3095f95d8 100644 --- a/gtk/gtkhbox.c +++ b/gtk/gtkhbox.c @@ -57,7 +57,7 @@ gtk_hbox_get_type (void) (GInstanceInitFunc) gtk_hbox_init, }; - hbox_type = g_type_register_static (GTK_TYPE_BOX, "GtkHBox", + hbox_type = g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkHBox"), &hbox_info, 0); } diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index c2860ccd4..90ec3b689 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -57,7 +57,7 @@ gtk_hpaned_get_type (void) (GInstanceInitFunc) gtk_hpaned_init, }; - hpaned_type = g_type_register_static (GTK_TYPE_PANED, "GtkHPaned", + hpaned_type = g_type_register_static (GTK_TYPE_PANED, g_intern_static_string ("GtkHPaned"), &hpaned_info, 0); } diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c index 66b176792..f25af4240 100644 --- a/gtk/gtkhruler.c +++ b/gtk/gtkhruler.c @@ -68,7 +68,7 @@ gtk_hruler_get_type (void) (GInstanceInitFunc) gtk_hruler_init, }; - hruler_type = g_type_register_static (GTK_TYPE_RULER, "GtkHRuler", + hruler_type = g_type_register_static (GTK_TYPE_RULER, g_intern_static_string ("GtkHRuler"), &hruler_info, 0); } diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index 43b84738e..1781b2c4e 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -63,7 +63,7 @@ gtk_hscale_get_type (void) (GInstanceInitFunc) gtk_hscale_init, }; - hscale_type = g_type_register_static (GTK_TYPE_SCALE, "GtkHScale", + hscale_type = g_type_register_static (GTK_TYPE_SCALE, g_intern_static_string ("GtkHScale"), &hscale_info, 0); } diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c index 135858aa8..23147f7f7 100644 --- a/gtk/gtkhscrollbar.c +++ b/gtk/gtkhscrollbar.c @@ -55,7 +55,7 @@ gtk_hscrollbar_get_type (void) }; hscrollbar_type = - g_type_register_static (GTK_TYPE_SCROLLBAR, "GtkHScrollbar", + g_type_register_static (GTK_TYPE_SCROLLBAR, g_intern_static_string ("GtkHScrollbar"), &hscrollbar_info, 0); } diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c index 12e9b5106..18c9c37b5 100644 --- a/gtk/gtkhseparator.c +++ b/gtk/gtkhseparator.c @@ -56,7 +56,7 @@ gtk_hseparator_get_type (void) }; hseparator_type = - g_type_register_static (GTK_TYPE_SEPARATOR, "GtkHSeparator", + g_type_register_static (GTK_TYPE_SEPARATOR, g_intern_static_string ("GtkHSeparator"), &hseparator_info, 0); } diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c index 2b690c0f0..a23bbd2f1 100644 --- a/gtk/gtkhsv.c +++ b/gtk/gtkhsv.c @@ -144,7 +144,7 @@ gtk_hsv_get_type (void) (GInstanceInitFunc) gtk_hsv_init, }; - hsv_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkHSV", + hsv_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkHSV"), &hsv_info, 0); } diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index e028d9386..feb64cbed 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -1537,7 +1537,7 @@ gtk_icon_set_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkIconSet", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkIconSet"), (GBoxedCopyFunc) gtk_icon_set_ref, (GBoxedFreeFunc) gtk_icon_set_unref); diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 3afe95924..b0d98b285 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -256,7 +256,7 @@ gtk_icon_theme_get_type (void) (GInstanceInitFunc) gtk_icon_theme_init, }; - type = g_type_register_static (G_TYPE_OBJECT, "GtkIconTheme", &info, 0); + type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkIconTheme"), &info, 0); } return type; @@ -2265,7 +2265,7 @@ gtk_icon_info_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkIconInfo", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkIconInfo"), (GBoxedCopyFunc) gtk_icon_info_copy, (GBoxedFreeFunc) gtk_icon_info_free); diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 215461af8..7d8778187 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -8058,7 +8058,7 @@ gtk_icon_view_item_accessible_get_type (void) }; type = g_type_register_static (ATK_TYPE_OBJECT, - "GtkIconViewItemAccessible", &tinfo, 0); + g_intern_static_string ("GtkIconViewItemAccessible"), &tinfo, 0); g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info); g_type_add_interface_static (type, ATK_TYPE_ACTION, diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index bb2a9232f..902dadb31 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -122,7 +122,7 @@ gtk_image_get_type (void) (GInstanceInitFunc) gtk_image_init, }; - image_type = g_type_register_static (GTK_TYPE_MISC, "GtkImage", + image_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkImage"), &image_info, 0); } diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index a8dcb1031..5b02969d7 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -93,7 +93,7 @@ gtk_image_menu_item_get_type (void) }; image_menu_item_type = - g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkImageMenuItem", + g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkImageMenuItem"), &image_menu_item_info, 0); } diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index d00eff7c0..e8315b55a 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -75,7 +75,7 @@ gtk_im_context_get_type (void) }; im_context_type = - g_type_register_static (G_TYPE_OBJECT, "GtkIMContext", + g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkIMContext"), &im_context_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index aff446367..05c584128 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -962,7 +962,7 @@ gtk_im_context_simple_get_type (void) }; im_context_simple_type = - g_type_register_static (GTK_TYPE_IM_CONTEXT, "GtkIMContextSimple", + g_type_register_static (GTK_TYPE_IM_CONTEXT, g_intern_static_string ("GtkIMContextSimple"), &im_context_simple_info, 0); } diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index a40744aff..26ace6d6e 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -188,7 +188,7 @@ gtk_im_module_get_type (void) }; im_module_type = - g_type_register_static (G_TYPE_TYPE_MODULE, "GtkIMModule", + g_type_register_static (G_TYPE_TYPE_MODULE, g_intern_static_string ("GtkIMModule"), &im_module_info, 0); } diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index 414d67ed2..db173d702 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -111,7 +111,7 @@ gtk_im_multicontext_get_type (void) }; im_multicontext_type = - g_type_register_static (GTK_TYPE_IM_CONTEXT, "GtkIMMulticontext", + g_type_register_static (GTK_TYPE_IM_CONTEXT, g_intern_static_string ("GtkIMMulticontext"), &im_multicontext_info, 0); } diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c index b936ee12a..e0b63f6ee 100644 --- a/gtk/gtkinputdialog.c +++ b/gtk/gtkinputdialog.c @@ -143,7 +143,7 @@ gtk_input_dialog_get_type (void) }; input_dialog_type = - g_type_register_static (GTK_TYPE_DIALOG, "GtkInputDialog", + g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkInputDialog"), &input_dialog_info, 0); } diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c index 93e86280d..08fbbc636 100644 --- a/gtk/gtkinvisible.c +++ b/gtk/gtkinvisible.c @@ -81,7 +81,7 @@ gtk_invisible_get_type (void) (GInstanceInitFunc) gtk_invisible_init, }; - invisible_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkInvisible", + invisible_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkInvisible"), &invisible_info, 0); } diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c index 2a822090d..34193e7e3 100644 --- a/gtk/gtkitem.c +++ b/gtk/gtkitem.c @@ -71,7 +71,7 @@ gtk_item_get_type (void) NULL, /* value_table */ }; - item_type = g_type_register_static (GTK_TYPE_BIN, "GtkItem", + item_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkItem"), &item_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index d91b93a9e..21c0c06fe 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -126,7 +126,7 @@ gtk_item_factory_get_type (void) }; item_factory_type = - g_type_register_static (GTK_TYPE_OBJECT, "GtkItemFactory", + g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkItemFactory"), &item_factory_info, 0); } diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 460285a0b..ad0645cf5 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -218,7 +218,7 @@ gtk_label_get_type (void) (GInstanceInitFunc) gtk_label_init, }; - label_type = g_type_register_static (GTK_TYPE_MISC, "GtkLabel", + label_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkLabel"), &label_info, 0); } diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index a28bcd253..5cdfd1531 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -581,7 +581,7 @@ gtk_layout_get_type (void) (GInstanceInitFunc) gtk_layout_init, }; - layout_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkLayout", + layout_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkLayout"), &layout_info, 0); } diff --git a/gtk/gtklist.c b/gtk/gtklist.c index 8f4d53726..1fb46a5bc 100644 --- a/gtk/gtklist.c +++ b/gtk/gtklist.c @@ -194,6 +194,7 @@ gtk_list_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkList"); list_type = gtk_type_unique (GTK_TYPE_CONTAINER, &list_info); } diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c index 6edd09c1f..1c841950d 100644 --- a/gtk/gtklistitem.c +++ b/gtk/gtklistitem.c @@ -93,6 +93,7 @@ gtk_list_item_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkListItem"); list_item_type = gtk_type_unique (gtk_item_get_type (), &list_item_info); } diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index b44f11617..2e64b2e7b 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -166,7 +166,7 @@ gtk_list_store_get_type (void) NULL }; - list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkListStore", + list_store_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkListStore"), &list_store_info, 0); g_type_add_interface_static (list_store_type, diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 5896e871f..5059afa0a 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -294,7 +294,7 @@ gtk_menu_get_type (void) (GInstanceInitFunc) gtk_menu_init, }; - menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, "GtkMenu", + menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, g_intern_static_string ("GtkMenu"), &menu_info, 0); } diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index c2427b553..fb6b378c6 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -109,7 +109,7 @@ gtk_menu_bar_get_type (void) NULL, /* instance_init */ }; - menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, "GtkMenuBar", + menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, g_intern_static_string ("GtkMenuBar"), &menu_bar_info, 0); } diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 433cc4102..0cca9f567 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -119,7 +119,7 @@ gtk_menu_item_get_type (void) (GInstanceInitFunc) gtk_menu_item_init, }; - menu_item_type = g_type_register_static (GTK_TYPE_ITEM, "GtkMenuItem", + menu_item_type = g_type_register_static (GTK_TYPE_ITEM, g_intern_static_string ("GtkMenuItem"), &menu_item_info, 0); } diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index afd9c5c31..ac6a0d7fd 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -227,7 +227,7 @@ gtk_menu_shell_get_type (void) }; menu_shell_type = - g_type_register_static (GTK_TYPE_CONTAINER, "GtkMenuShell", + g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkMenuShell"), &menu_shell_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index 856a4f15d..84833e051 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -88,7 +88,7 @@ gtk_menu_tool_button_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOOL_BUTTON, - "GtkMenuToolButton", + g_intern_static_string ("GtkMenuToolButton"), &info, 0); } diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index 483ad5fe0..81890256a 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -98,7 +98,7 @@ gtk_message_dialog_get_type (void) (GInstanceInitFunc) gtk_message_dialog_init, }; - dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkMessageDialog", + dialog_type = g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkMessageDialog"), &dialog_info, 0); } diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c index bc06f8a0a..24268f2b8 100644 --- a/gtk/gtkmisc.c +++ b/gtk/gtkmisc.c @@ -74,7 +74,7 @@ gtk_misc_get_type (void) NULL, /* value_table */ }; - misc_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkMisc", + misc_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkMisc"), &misc_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 881d310f5..057c34f8e 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -314,7 +314,7 @@ gtk_notebook_get_type (void) (GInstanceInitFunc) gtk_notebook_init, }; - notebook_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkNotebook", + notebook_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkNotebook"), ¬ebook_info, 0); } diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 38fe20006..58281fc8b 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -95,7 +95,7 @@ gtk_object_get_type (void) NULL, /* value_table */ }; - object_type = g_type_register_static (G_TYPE_OBJECT, "GtkObject", + object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkObject"), &object_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c index 8540137fc..690a623d6 100644 --- a/gtk/gtkoldeditable.c +++ b/gtk/gtkoldeditable.c @@ -158,7 +158,7 @@ gtk_old_editable_get_type (void) NULL /* interface_data */ }; - old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkOldEditable", + old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkOldEditable"), &old_editable_info, G_TYPE_FLAG_ABSTRACT); g_type_add_interface_static (old_editable_type, GTK_TYPE_EDITABLE, diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index feb62717a..f386434ac 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -141,7 +141,7 @@ gtk_option_menu_get_type (void) }; option_menu_type = - g_type_register_static (GTK_TYPE_BUTTON, "GtkOptionMenu", + g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkOptionMenu"), &option_menu_info, 0); } diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index f6b32588a..f4e711fb9 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -161,7 +161,7 @@ gtk_paned_get_type (void) NULL, /* value_table */ }; - paned_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPaned", + paned_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkPaned"), &paned_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index ed80304fe..bccf797f8 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -75,9 +75,7 @@ struct _ButtonData */ #define BUTTON_IS_FAKE_ROOT(button) ((button)->type == HOME_BUTTON) -G_DEFINE_TYPE (GtkPathBar, - gtk_path_bar, - GTK_TYPE_CONTAINER); +G_DEFINE_TYPE (GtkPathBar, gtk_path_bar, GTK_TYPE_CONTAINER); static void gtk_path_bar_finalize (GObject *object); static void gtk_path_bar_dispose (GObject *object); diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index 4768f77f7..2d92298cc 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -65,6 +65,7 @@ gtk_pixmap_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkPixmap"); pixmap_type = gtk_type_unique (GTK_TYPE_MISC, &pixmap_info); } diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index f901dae5e..3c557c9f5 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -91,7 +91,7 @@ gtk_plug_get_type (void) (GInstanceInitFunc) gtk_plug_init, }; - plug_type = g_type_register_static (GTK_TYPE_WINDOW, "GtkPlug", + plug_type = g_type_register_static (GTK_TYPE_WINDOW, g_intern_static_string ("GtkPlug"), &plug_info, 0); } diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c index 683d21cd8..bfd937958 100644 --- a/gtk/gtkpreview.c +++ b/gtk/gtkpreview.c @@ -94,6 +94,7 @@ gtk_preview_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkPreview"); preview_type = gtk_type_unique (GTK_TYPE_WIDGET, &preview_info); } diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c index cb3fcc292..4fa9b415e 100644 --- a/gtk/gtkprogress.c +++ b/gtk/gtkprogress.c @@ -92,7 +92,7 @@ gtk_progress_get_type (void) (GInstanceInitFunc) gtk_progress_init, }; - progress_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkProgress", + progress_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkProgress"), &progress_info, 0); } diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 95951c04a..452cfa222 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -112,7 +112,7 @@ gtk_progress_bar_get_type (void) }; progress_bar_type = - g_type_register_static (GTK_TYPE_PROGRESS, "GtkProgressBar", + g_type_register_static (GTK_TYPE_PROGRESS, g_intern_static_string ("GtkProgressBar"), &progress_bar_info, 0); } diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c index 13956cc54..92c3173ef 100644 --- a/gtk/gtkradioaction.c +++ b/gtk/gtkradioaction.c @@ -96,7 +96,7 @@ gtk_radio_action_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOGGLE_ACTION, - "GtkRadioAction", + g_intern_static_string ("GtkRadioAction"), &type_info, 0); } return type; diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 1c42cf127..16c31bf15 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -81,7 +81,7 @@ gtk_radio_button_get_type (void) }; radio_button_type = - g_type_register_static (GTK_TYPE_CHECK_BUTTON, "GtkRadioButton", + g_type_register_static (GTK_TYPE_CHECK_BUTTON, g_intern_static_string ("GtkRadioButton"), &radio_button_info, 0); } diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index 724aa07ea..9d12cda4b 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -77,7 +77,7 @@ gtk_radio_menu_item_get_type (void) }; radio_menu_item_type = - g_type_register_static (GTK_TYPE_CHECK_MENU_ITEM, "GtkRadioMenuItem", + g_type_register_static (GTK_TYPE_CHECK_MENU_ITEM, g_intern_static_string ("GtkRadioMenuItem"), &radio_menu_item_info, 0); } diff --git a/gtk/gtkradiotoolbutton.c b/gtk/gtkradiotoolbutton.c index 5f851bf25..9b91bb982 100644 --- a/gtk/gtkradiotoolbutton.c +++ b/gtk/gtkradiotoolbutton.c @@ -60,7 +60,7 @@ gtk_radio_tool_button_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOGGLE_TOOL_BUTTON, - "GtkRadioToolButton", &type_info, 0); + g_intern_static_string ("GtkRadioToolButton"), &type_info, 0); } return type; } diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index d5c55f83f..c9d2d8e38 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -208,7 +208,7 @@ gtk_range_get_type (void) NULL, /* value_table */ }; - range_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkRange", + range_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkRange"), &range_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 52725d1ad..1c779e163 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -945,7 +945,7 @@ gtk_rc_style_get_type (void) (GInstanceInitFunc) gtk_rc_style_init, }; - rc_style_type = g_type_register_static (G_TYPE_OBJECT, "GtkRcStyle", + rc_style_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkRcStyle"), &rc_style_info, 0); } diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index 6840b8649..894f8bef3 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -87,7 +87,7 @@ gtk_ruler_get_type (void) (GInstanceInitFunc) gtk_ruler_init, }; - ruler_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkRuler", + ruler_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkRuler"), &ruler_info, 0); } diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 38724adf8..9454cbebd 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -105,7 +105,7 @@ gtk_scale_get_type (void) NULL, /* value_table */ }; - scale_type = g_type_register_static (GTK_TYPE_RANGE, "GtkScale", + scale_type = g_type_register_static (GTK_TYPE_RANGE, g_intern_static_string ("GtkScale"), &scale_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index e58f64605..cfb71c2b9 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -60,7 +60,7 @@ gtk_scrollbar_get_type (void) }; scrollbar_type = - g_type_register_static (GTK_TYPE_RANGE, "GtkScrollbar", + g_type_register_static (GTK_TYPE_RANGE, g_intern_static_string ("GtkScrollbar"), &scrollbar_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index af2454913..ab98e2046 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -158,7 +158,7 @@ gtk_scrolled_window_get_type (void) }; scrolled_window_type = - g_type_register_static (GTK_TYPE_BIN, "GtkScrolledWindow", + g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkScrolledWindow"), &scrolled_window_info, 0); } diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 067409c94..e7ef8443d 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -2746,7 +2746,7 @@ gtk_selection_data_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkSelectionData", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkSelectionData"), (GBoxedCopyFunc) gtk_selection_data_copy, (GBoxedFreeFunc) gtk_selection_data_free); diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c index b371301ba..dc5bf8626 100644 --- a/gtk/gtkseparator.c +++ b/gtk/gtkseparator.c @@ -55,7 +55,7 @@ gtk_separator_get_type (void) }; separator_type = - g_type_register_static (GTK_TYPE_WIDGET, "GtkSeparator", + g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkSeparator"), &separator_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c index 3fcfa61ea..dbb942d02 100644 --- a/gtk/gtkseparatortoolitem.c +++ b/gtk/gtkseparatortoolitem.c @@ -88,7 +88,7 @@ gtk_separator_tool_item_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOOL_ITEM, - "GtkSeparatorToolItem", &type_info, 0); + g_intern_static_string ("GtkSeparatorToolItem"), &type_info, 0); } return type; } diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 06ab33ffd..6a4e4823c 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -137,7 +137,7 @@ gtk_settings_get_type (void) (GInstanceInitFunc) gtk_settings_init, }; - settings_type = g_type_register_static (G_TYPE_OBJECT, "GtkSettings", + settings_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkSettings"), &settings_info, 0); } diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index a1577ecb9..0b9b77fea 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -322,7 +322,7 @@ gtk_size_group_get_type (void) (GInstanceInitFunc) gtk_size_group_init, }; - size_group_type = g_type_register_static (G_TYPE_OBJECT, "GtkSizeGroup", + size_group_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkSizeGroup"), &size_group_info, 0); } diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index c2b28e31e..47e46688a 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -138,7 +138,7 @@ gtk_socket_get_type (void) (GInstanceInitFunc) gtk_socket_init, }; - socket_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkSocket", + socket_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkSocket"), &socket_info, 0); } diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 327dde776..b65877c45 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -176,7 +176,7 @@ gtk_spin_button_get_type (void) }; spin_button_type = - g_type_register_static (GTK_TYPE_ENTRY, "GtkSpinButton", + g_type_register_static (GTK_TYPE_ENTRY, g_intern_static_string ("GtkSpinButton"), &spin_button_info, 0); g_type_add_interface_static (spin_button_type, diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index 8f4eb93a8..e07b7b800 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -117,7 +117,7 @@ gtk_statusbar_get_type (void) (GInstanceInitFunc) gtk_statusbar_init, }; - statusbar_type = g_type_register_static (GTK_TYPE_HBOX, "GtkStatusbar", + statusbar_type = g_type_register_static (GTK_TYPE_HBOX, g_intern_static_string ("GtkStatusbar"), &statusbar_info, 0); } diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 54ec01015..3cf0094bc 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -376,7 +376,7 @@ gtk_style_get_type (void) (GInstanceInitFunc) gtk_style_init, }; - style_type = g_type_register_static (G_TYPE_OBJECT, "GtkStyle", + style_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkStyle"), &style_info, 0); } @@ -6402,7 +6402,7 @@ gtk_border_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkBorder", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkBorder"), (GBoxedCopyFunc) gtk_border_copy, (GBoxedFreeFunc) gtk_border_free); diff --git a/gtk/gtktable.c b/gtk/gtktable.c index 055224557..9c4a250d0 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -123,7 +123,7 @@ gtk_table_get_type (void) (GInstanceInitFunc) gtk_table_init, }; - table_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkTable", + table_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTable"), &table_info, 0); } diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index c68e48327..4d4728404 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -65,7 +65,7 @@ gtk_tearoff_menu_item_get_type (void) }; tearoff_menu_item_type = - g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkTearoffMenuItem", + g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkTearoffMenuItem"), &tearoff_menu_item_info, 0); } diff --git a/gtk/gtktext.c b/gtk/gtktext.c index be7a6fe60..14902669f 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -540,6 +540,7 @@ gtk_text_get_type (void) NULL /* interface_data */ }; + g_intern_static_string ("GtkText"); text_type = gtk_type_unique (GTK_TYPE_OLD_EDITABLE, &text_info); g_type_add_interface_static (text_type, GTK_TYPE_EDITABLE, diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 3a18a739f..d40fa29a6 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -155,7 +155,7 @@ gtk_text_buffer_get_type (void) (GInstanceInitFunc) gtk_text_buffer_init }; - our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextBuffer", + our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextBuffer"), &our_info, 0); } diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c index 68f5dd5fb..c06361938 100644 --- a/gtk/gtktextchild.c +++ b/gtk/gtktextchild.c @@ -329,7 +329,7 @@ gtk_text_child_anchor_get_type (void) (GInstanceInitFunc) gtk_text_child_anchor_init, }; - object_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextChildAnchor", + object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextChildAnchor"), &object_info, 0); } diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 3a564c42b..b2335274f 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -184,7 +184,7 @@ gtk_text_layout_get_type (void) (GInstanceInitFunc) gtk_text_layout_init }; - our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextLayout", + our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextLayout"), &our_info, 0); } diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c index 52af695bc..a6d7a04c6 100644 --- a/gtk/gtktextmark.c +++ b/gtk/gtktextmark.c @@ -79,7 +79,7 @@ gtk_text_mark_get_type (void) (GInstanceInitFunc) gtk_text_mark_init, }; - object_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextMark", + object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextMark"), &object_info, 0); } diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index e596f7dcf..ac942269c 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -175,7 +175,7 @@ gtk_text_tag_get_type (void) (GInstanceInitFunc) gtk_text_tag_init }; - our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextTag", + our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextTag"), &our_info, 0); } @@ -1971,7 +1971,7 @@ gtk_text_attributes_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkTextAttributes", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTextAttributes"), (GBoxedCopyFunc) gtk_text_attributes_ref, (GBoxedFreeFunc) gtk_text_attributes_unref); diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c index a60e041b8..1dd1c18f6 100644 --- a/gtk/gtktexttagtable.c +++ b/gtk/gtktexttagtable.c @@ -78,7 +78,7 @@ gtk_text_tag_table_get_type (void) (GInstanceInitFunc) gtk_text_tag_table_init }; - our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextTagTable", + our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextTagTable"), &our_info, 0); } diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 045f0e926..722277297 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -441,7 +441,7 @@ gtk_text_view_get_type (void) (GInstanceInitFunc) gtk_text_view_init, }; - our_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkTextView", + our_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTextView"), &our_info, 0); } diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c index 78fbac6d1..141791df4 100644 --- a/gtk/gtkthemes.c +++ b/gtk/gtkthemes.c @@ -150,7 +150,7 @@ gtk_theme_engine_get_type (void) }; theme_engine_type = - g_type_register_static (G_TYPE_TYPE_MODULE, "GtkThemeEngine", + g_type_register_static (G_TYPE_TYPE_MODULE, g_intern_static_string ("GtkThemeEngine"), &theme_engine_info, 0); } diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c index b5ec6b0aa..4563fe813 100644 --- a/gtk/gtktipsquery.c +++ b/gtk/gtktipsquery.c @@ -105,6 +105,7 @@ gtk_tips_query_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkTipsQuery"); tips_query_type = gtk_type_unique (gtk_label_get_type (), &tips_query_info); } diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c index f607d3d99..7c6a00415 100644 --- a/gtk/gtktoggleaction.c +++ b/gtk/gtktoggleaction.c @@ -75,7 +75,7 @@ gtk_toggle_action_get_type (void) }; type = g_type_register_static (GTK_TYPE_ACTION, - "GtkToggleAction", + g_intern_static_string ("GtkToggleAction"), &type_info, 0); } return type; diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index a51876d2b..46fa079da 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -93,7 +93,7 @@ gtk_toggle_button_get_type (void) }; toggle_button_type = - g_type_register_static (GTK_TYPE_BUTTON, "GtkToggleButton", + g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkToggleButton"), &toggle_button_info, 0); } diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c index 0485cbe27..cabae8800 100644 --- a/gtk/gtktoggletoolbutton.c +++ b/gtk/gtktoggletoolbutton.c @@ -93,7 +93,7 @@ gtk_toggle_tool_button_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOOL_BUTTON, - "GtkToggleToolButton", &type_info, 0); + g_intern_static_string ("GtkToggleToolButton"), &type_info, 0); } return type; } diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index e3d386534..080773229 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -324,7 +324,7 @@ gtk_toolbar_get_type (void) }; type = g_type_register_static (GTK_TYPE_CONTAINER, - "GtkToolbar", + g_intern_static_string ("GtkToolbar"), &type_info, 0); } diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index cfb6720e7..4fb6c1d42 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -116,7 +116,7 @@ gtk_tool_button_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOOL_ITEM, - "GtkToolButton", + g_intern_static_string ("GtkToolButton"), &type_info, 0); } return type; diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index c2fcf4fff..83deeb9ab 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -122,7 +122,7 @@ gtk_tool_item_get_type (void) }; type = g_type_register_static (GTK_TYPE_BIN, - "GtkToolItem", + g_intern_static_string ("GtkToolItem"), &type_info, 0); } return type; diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index b63f25575..b8ba8d406 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -92,7 +92,7 @@ gtk_tooltips_get_type (void) (GInstanceInitFunc) gtk_tooltips_init, }; - tooltips_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTooltips", + tooltips_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkTooltips"), &tooltips_info, 0); } diff --git a/gtk/gtktree.c b/gtk/gtktree.c index 55bbce15e..79276dbbb 100644 --- a/gtk/gtktree.c +++ b/gtk/gtktree.c @@ -98,6 +98,7 @@ gtk_tree_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkTree"); tree_type = gtk_type_unique (gtk_container_get_type (), &tree_info); } diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c index f6f5380a2..2431c950a 100644 --- a/gtk/gtktreednd.c +++ b/gtk/gtktreednd.c @@ -42,7 +42,7 @@ gtk_tree_drag_source_get_type (void) NULL }; - our_type = g_type_register_static (G_TYPE_INTERFACE, "GtkTreeDragSource", + our_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeDragSource"), &our_info, 0); } @@ -70,7 +70,7 @@ gtk_tree_drag_dest_get_type (void) NULL }; - our_type = g_type_register_static (G_TYPE_INTERFACE, "GtkTreeDragDest", &our_info, 0); + our_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeDragDest"), &our_info, 0); } return our_type; diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c index d07b7b381..e944a7c4a 100644 --- a/gtk/gtktreeitem.c +++ b/gtk/gtktreeitem.c @@ -118,6 +118,7 @@ gtk_tree_item_get_type (void) (GtkClassInitFunc) NULL, }; + g_intern_static_string ("GtkTreeItem"); tree_item_type = gtk_type_unique (gtk_item_get_type (), &tree_item_info); } diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index bf77aff83..5178dbbc7 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -115,7 +115,7 @@ gtk_tree_model_get_type (void) }; tree_model_type = - g_type_register_static (G_TYPE_INTERFACE, "GtkTreeModel", + g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeModel"), &tree_model_info, 0); g_type_interface_add_prerequisite (tree_model_type, G_TYPE_OBJECT); @@ -599,7 +599,7 @@ gtk_tree_path_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkTreePath", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreePath"), (GBoxedCopyFunc) gtk_tree_path_copy, (GBoxedFreeFunc) gtk_tree_path_free); @@ -827,7 +827,7 @@ gtk_tree_iter_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkTreeIter", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreeIter"), (GBoxedCopyFunc) gtk_tree_iter_copy, (GBoxedFreeFunc) gtk_tree_iter_free); @@ -1577,7 +1577,7 @@ gtk_tree_row_reference_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkTreeRowReference", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreeRowReference"), (GBoxedCopyFunc) gtk_tree_row_reference_copy, (GBoxedFreeFunc) gtk_tree_row_reference_free); diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index cd0a27437..fd9241279 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -280,7 +280,7 @@ gtk_tree_model_filter_get_type (void) }; tree_model_filter_type = g_type_register_static (G_TYPE_OBJECT, - "GtkTreeModelFilter", + g_intern_static_string ("GtkTreeModelFilter"), &tree_model_filter_info, 0); g_type_add_interface_static (tree_model_filter_type, diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index ed1579421..86c145648 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -282,7 +282,7 @@ gtk_tree_model_sort_get_type (void) }; tree_model_sort_type = - g_type_register_static (G_TYPE_OBJECT, "GtkTreeModelSort", + g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeModelSort"), &tree_model_sort_info, 0); g_type_add_interface_static (tree_model_sort_type, diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index 676a22177..a269a1e0a 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -66,7 +66,7 @@ gtk_tree_selection_get_type (void) }; selection_type = - g_type_register_static (G_TYPE_OBJECT, "GtkTreeSelection", + g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeSelection"), &selection_info, 0); } diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c index cd57fc918..5a1759897 100644 --- a/gtk/gtktreesortable.c +++ b/gtk/gtktreesortable.c @@ -46,7 +46,7 @@ gtk_tree_sortable_get_type (void) }; tree_sortable_type = - g_type_register_static (G_TYPE_INTERFACE, "GtkTreeSortable", + g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeSortable"), &tree_sortable_info, 0); g_type_interface_add_prerequisite (tree_sortable_type, GTK_TYPE_TREE_MODEL); diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 157c39a11..65516895d 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -185,7 +185,7 @@ gtk_tree_store_get_type (void) NULL }; - tree_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeStore", + tree_store_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeStore"), &tree_store_info, 0); g_type_add_interface_static (tree_store_type, diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index d7fc33c38..2db0cb954 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -484,7 +484,7 @@ gtk_tree_view_get_type (void) }; tree_view_type = - g_type_register_static (GTK_TYPE_CONTAINER, "GtkTreeView", + g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTreeView"), &tree_view_info, 0); } diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index b4fae3dca..a4ddc42ac 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -185,7 +185,7 @@ gtk_tree_view_column_get_type (void) }; tree_column_type = - g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeViewColumn", + g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkTreeViewColumn"), &tree_column_info, 0); g_type_add_interface_static (tree_column_type, diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index bde6ccf83..f28f048a1 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -190,7 +190,7 @@ gtk_ui_manager_get_type (void) }; type = g_type_register_static (G_TYPE_OBJECT, - "GtkUIManager", + g_intern_static_string ("GtkUIManager"), &type_info, 0); } return type; diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index 3fc0a444e..0eb9b7e3e 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -60,7 +60,7 @@ gtk_vbutton_box_get_type (void) }; vbutton_box_type = - g_type_register_static (GTK_TYPE_BUTTON_BOX, "GtkVButtonBox", + g_type_register_static (GTK_TYPE_BUTTON_BOX, g_intern_static_string ("GtkVButtonBox"), &vbutton_box_info, 0); } diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c index 705e217b9..43a0ab431 100644 --- a/gtk/gtkvbox.c +++ b/gtk/gtkvbox.c @@ -57,7 +57,7 @@ gtk_vbox_get_type (void) (GInstanceInitFunc) gtk_vbox_init, }; - vbox_type = g_type_register_static (GTK_TYPE_BOX, "GtkVBox", + vbox_type = g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkVBox"), &vbox_info, 0); } diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index c87da8b20..e88144c15 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -93,7 +93,7 @@ gtk_viewport_get_type (void) (GInstanceInitFunc) gtk_viewport_init, }; - viewport_type = g_type_register_static (GTK_TYPE_BIN, "GtkViewport", + viewport_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkViewport"), &viewport_info, 0); } diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index 1943b9272..25a1de7d3 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -57,7 +57,7 @@ gtk_vpaned_get_type (void) (GInstanceInitFunc) gtk_vpaned_init, }; - vpaned_type = g_type_register_static (GTK_TYPE_PANED, "GtkVPaned", + vpaned_type = g_type_register_static (GTK_TYPE_PANED, g_intern_static_string ("GtkVPaned"), &vpaned_info, 0); } diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c index e0862669a..0115aa7f9 100644 --- a/gtk/gtkvruler.c +++ b/gtk/gtkvruler.c @@ -69,7 +69,7 @@ gtk_vruler_get_type (void) (GInstanceInitFunc) gtk_vruler_init, }; - vruler_type = g_type_register_static (GTK_TYPE_RULER, "GtkVRuler", + vruler_type = g_type_register_static (GTK_TYPE_RULER, g_intern_static_string ("GtkVRuler"), &vruler_info, 0); } diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index ed2e8e908..a512b816c 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -65,7 +65,7 @@ gtk_vscale_get_type (void) (GInstanceInitFunc) gtk_vscale_init, }; - vscale_type = g_type_register_static (GTK_TYPE_SCALE, "GtkVScale", + vscale_type = g_type_register_static (GTK_TYPE_SCALE, g_intern_static_string ("GtkVScale"), &vscale_info, 0); } diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c index 714add7a8..6004af619 100644 --- a/gtk/gtkvscrollbar.c +++ b/gtk/gtkvscrollbar.c @@ -55,7 +55,7 @@ gtk_vscrollbar_get_type (void) }; vscrollbar_type = - g_type_register_static (GTK_TYPE_SCROLLBAR, "GtkVScrollbar", + g_type_register_static (GTK_TYPE_SCROLLBAR, g_intern_static_string ("GtkVScrollbar"), &vscrollbar_info, 0); } diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c index 15798991d..1b90e86e9 100644 --- a/gtk/gtkvseparator.c +++ b/gtk/gtkvseparator.c @@ -56,7 +56,7 @@ gtk_vseparator_get_type (void) }; vseparator_type = - g_type_register_static (GTK_TYPE_SEPARATOR, "GtkVSeparator", + g_type_register_static (GTK_TYPE_SEPARATOR, g_intern_static_string ("GtkVSeparator"), &vseparator_info, 0); } diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index a24a10133..241277f3e 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -288,7 +288,7 @@ gtk_widget_get_type (void) NULL /* interface data */ }; - widget_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkWidget", + widget_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkWidget"), &widget_info, G_TYPE_FLAG_ABSTRACT); g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR, @@ -7519,7 +7519,7 @@ gtk_requisition_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkRequisition", + our_type = g_boxed_type_register_static (g_intern_static_string ("GtkRequisition"), (GBoxedCopyFunc) gtk_requisition_copy, (GBoxedFreeFunc) gtk_requisition_free); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 43c8ef763..d4ab6c51a 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -317,7 +317,7 @@ gtk_window_get_type (void) (GInstanceInitFunc) gtk_window_init, }; - window_type = g_type_register_static (GTK_TYPE_BIN, "GtkWindow", + window_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkWindow"), &window_info, 0); } @@ -6940,7 +6940,8 @@ gtk_window_group_get_type (void) (GInstanceInitFunc) NULL, }; - window_group_type = g_type_register_static (G_TYPE_OBJECT, "GtkWindowGroup", &window_group_info, 0); + window_group_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkWindowGroup"), + &window_group_info, 0); } return window_group_type; |