Commit c09cc893 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Intern type names in code generated by glib-mkenums, too.

2005-08-31  Matthias Clasen  <mclasen@redhat.com>

	* 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.
parent f55cffb0
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
......
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
......
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)
......
......@@ -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
#
......
......@@ -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
......
......@@ -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
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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,
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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,
......
......@@ -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,
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
......
......@@ -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,
......
......@@ -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,
......
......@@ -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);
......
......@@ -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,
......
......@@ -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,
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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);
}
......
......@@ -135,7 +135,7 @@ gtk_font_button_get_type (void)
};