Commit fe520925 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/base/Makefile.am app/core/Makefile.am app/display/Makefile.am

2008-11-03  Sven Neumann  <sven@gimp.org>

	
	* app/base/Makefile.am
	* app/core/Makefile.am
	* app/display/Makefile.am
	* app/paint/Makefile.am
	* app/plug-in/Makefile.am
	* app/text/Makefile.am
	* app/tools/Makefile.am
	* app/widgets/Makefile.am
	* libgimp/Makefile.am
	* libgimpbase/Makefile.am: 
	* libgimpconfig/Makefile.am
	* libgimpthumb/Makefile.am
	* libgimpwidgets/Makefile.am: micro-optimization in the 
generated
	enum registration code.

	* app/base/base-enums.c
	* app/core/core-enums.c
	* app/display/display-enums.c
	* app/paint/paint-enums.c
	* app/plug-in/plug-in-enums.c
	* app/text/text-enums.c
	* app/tools/tools-enums.c
	* app/widgets/widgets-enums.c
	* libgimpbase/gimpbaseenums.c
	* libgimpconfig/gimpcolorconfig-enums.c
	* libgimpwidgets/gimpwidgetsenums.c: regenerated.


svn path=/trunk/; revision=27538
parent b994ab72
2008-11-03 Sven Neumann <sven@gimp.org>
* app/base/Makefile.am
* app/core/Makefile.am
* app/display/Makefile.am
* app/paint/Makefile.am
* app/plug-in/Makefile.am
* app/text/Makefile.am
* app/tools/Makefile.am
* app/widgets/Makefile.am
* libgimp/Makefile.am
* libgimpbase/Makefile.am:
* libgimpconfig/Makefile.am
* libgimpthumb/Makefile.am
* libgimpwidgets/Makefile.am: micro-optimization in the generated
enum registration code.
* app/base/base-enums.c
* app/core/core-enums.c
* app/display/display-enums.c
* app/paint/paint-enums.c
* app/plug-in/plug-in-enums.c
* app/text/text-enums.c
* app/tools/tools-enums.c
* app/widgets/widgets-enums.c
* libgimpbase/gimpbaseenums.c
* libgimpconfig/gimpcolorconfig-enums.c
* libgimpwidgets/gimpwidgetsenums.c: regenerated.
2008-11-03 Michael Natterer <mitch@gimp.org>
* app/core/gimp-edit.c
......
......@@ -92,7 +92,7 @@ base-enums.c: $(srcdir)/base-enums.h $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \
--dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/base-enums.h > xgen-bec \
&& cp xgen-bec $(@F) \
&& rm -f xgen-bec
......@@ -27,7 +27,7 @@ gimp_curve_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpCurveType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -63,7 +63,7 @@ gimp_histogram_channel_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpHistogramChannel", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -139,7 +139,7 @@ gimp_layer_mode_effects_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpLayerModeEffects", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -177,7 +177,7 @@ gimp_hue_range_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpHueRange", values);
gimp_enum_set_value_descriptions (type, descs);
......
......@@ -373,7 +373,7 @@ core-enums.c: $(srcdir)/core-enums.h $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \
--dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/core-enums.h > xgen-cec \
&& cp xgen-cec $(@F) \
&& rm -f xgen-cec
......@@ -27,7 +27,7 @@ gimp_container_policy_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpContainerPolicy", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -59,7 +59,7 @@ gimp_convert_dither_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpConvertDitherType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -91,7 +91,7 @@ gimp_convert_palette_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpConvertPaletteType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -135,7 +135,7 @@ gimp_gravity_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpGravityType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -183,7 +183,7 @@ gimp_alignment_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpAlignmentType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -219,7 +219,7 @@ gimp_align_reference_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpAlignReferenceType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -255,7 +255,7 @@ gimp_fill_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpFillType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -283,7 +283,7 @@ gimp_fill_style_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpFillStyle", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -311,7 +311,7 @@ gimp_stroke_method_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpStrokeMethod", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -341,7 +341,7 @@ gimp_join_style_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpJoinStyle", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -371,7 +371,7 @@ gimp_cap_style_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpCapStyle", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -417,7 +417,7 @@ gimp_dash_preset_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpDashPreset", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -447,7 +447,7 @@ gimp_brush_generated_shape_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpBrushGeneratedShape", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -477,7 +477,7 @@ gimp_orientation_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpOrientationType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -511,7 +511,7 @@ gimp_item_set_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpItemSet", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -541,7 +541,7 @@ gimp_rotation_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpRotationType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -583,7 +583,7 @@ gimp_view_size_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpViewSize", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -611,7 +611,7 @@ gimp_view_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpViewType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -647,7 +647,7 @@ gimp_selection_control_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpSelectionControl", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -677,7 +677,7 @@ gimp_thumbnail_size_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpThumbnailSize", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -705,7 +705,7 @@ gimp_undo_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpUndoMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -745,7 +745,7 @@ gimp_undo_event_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpUndoEvent", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -935,7 +935,7 @@ gimp_undo_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpUndoType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -981,7 +981,7 @@ gimp_dirty_mask_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_flags_register_static ("GimpDirtyMask", values);
gimp_flags_set_value_descriptions (type, descs);
......@@ -1009,7 +1009,7 @@ gimp_offset_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpOffsetType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -1043,7 +1043,7 @@ gimp_gradient_color_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpGradientColor", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -1077,7 +1077,7 @@ gimp_gradient_segment_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpGradientSegmentType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -1107,7 +1107,7 @@ gimp_gradient_segment_color_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpGradientSegmentColor", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -1135,7 +1135,7 @@ gimp_mask_apply_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpMaskApplyMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -1167,7 +1167,7 @@ gimp_merge_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpMergeType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -1205,7 +1205,7 @@ gimp_select_criterion_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpSelectCriterion", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -1235,7 +1235,7 @@ gimp_message_severity_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpMessageSeverity", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -1265,7 +1265,7 @@ gimp_color_profile_policy_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpColorProfilePolicy", values);
gimp_enum_set_value_descriptions (type, descs);
......
......@@ -104,7 +104,7 @@ display-enums.c: $(srcdir)/display-enums.h $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \
--dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/display-enums.h > xgen-dec \
&& cp xgen-dec $(@F) \
&& rm -f xgen-dec
......@@ -29,7 +29,7 @@ gimp_cursor_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpCursorMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -59,7 +59,7 @@ gimp_cursor_precision_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpCursorPrecision", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -91,7 +91,7 @@ gimp_canvas_padding_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpCanvasPaddingMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -121,7 +121,7 @@ gimp_space_bar_action_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpSpaceBarAction", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -149,7 +149,7 @@ gimp_zoom_quality_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpZoomQuality", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -179,7 +179,7 @@ gimp_zoom_focus_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpZoomFocus", values);
gimp_enum_set_value_descriptions (type, descs);
......
......@@ -101,7 +101,7 @@ paint-enums.c: $(srcdir)/paint-enums.h $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \
--dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/paint-enums.h > xgen-pec \
&& cp xgen-pec $(@F) \
&& rm -f xgen-pec
......@@ -27,7 +27,7 @@ gimp_brush_application_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpBrushApplicationMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -55,7 +55,7 @@ gimp_perspective_clone_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpPerspectiveCloneMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -87,7 +87,7 @@ gimp_source_align_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpSourceAlignMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -115,7 +115,7 @@ gimp_convolve_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpConvolveType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -145,7 +145,7 @@ gimp_ink_blob_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpInkBlobType", values);
gimp_enum_set_value_descriptions (type, descs);
......
......@@ -96,7 +96,7 @@ plug-in-enums.c: $(srcdir)/plug-in-enums.h $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \
--dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/plug-in-enums.h > xgen-bec \
&& cp xgen-bec $(@F) \
&& rm -f xgen-bec
......@@ -35,7 +35,7 @@ gimp_plug_in_image_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_flags_register_static ("GimpPlugInImageType", values);
gimp_flags_set_value_descriptions (type, descs);
......@@ -67,7 +67,7 @@ gimp_plug_in_call_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpPlugInCallMode", values);
gimp_enum_set_value_descriptions (type, descs);
......
......@@ -74,7 +74,7 @@ text-enums.c: $(srcdir)/text-enums.h $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \
--dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/text-enums.h > xgen-tec \
&& cp xgen-tec $(@F) \
&& rm -f xgen-tec
......@@ -27,7 +27,7 @@ gimp_text_box_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpTextBoxMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -57,7 +57,7 @@ gimp_text_outline_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpTextOutline", values);
gimp_enum_set_value_descriptions (type, descs);
......
......@@ -213,7 +213,7 @@ tools-enums.c: $(srcdir)/tools-enums.h $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \
--dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/tools-enums.h > xgen-tec \
&& cp xgen-tec $(@F) \
&& rm -f xgen-tec
......@@ -32,7 +32,7 @@ gimp_button_release_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpButtonReleaseType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -64,7 +64,7 @@ gimp_rectangle_guide_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpRectangleGuide", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -94,7 +94,7 @@ gimp_rectangle_constraint_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpRectangleConstraint", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -122,7 +122,7 @@ gimp_rectangle_precision_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpRectanglePrecision", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -154,7 +154,7 @@ gimp_rectangle_tool_fixed_rule_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpRectangleToolFixedRule", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -184,7 +184,7 @@ gimp_rect_select_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpRectSelectMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -214,7 +214,7 @@ gimp_transform_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpTransformType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -246,7 +246,7 @@ gimp_transform_preview_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpTransformPreviewType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -274,7 +274,7 @@ gimp_transform_grid_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpTransformGridType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -304,7 +304,7 @@ gimp_vector_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpVectorMode", values);
gimp_enum_set_value_descriptions (type, descs);
......
......@@ -375,7 +375,7 @@ widgets-enums.c: $(srcdir)/widgets-enums.h $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \
--dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/widgets-enums.h > xgen-wec \
&& cp xgen-wec $(@F) \
&& rm -f xgen-wec
......@@ -27,7 +27,7 @@ gimp_active_color_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpActiveColor", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -57,7 +57,7 @@ gimp_color_dialog_state_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpColorDialogState", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -89,7 +89,7 @@ gimp_color_frame_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpColorFrameMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -121,7 +121,7 @@ gimp_color_pick_mode_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpColorPickMode", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -149,7 +149,7 @@ gimp_color_pick_state_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpColorPickState", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -177,7 +177,7 @@ gimp_cursor_format_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpCursorFormat", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -205,7 +205,7 @@ gimp_help_browser_type_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpHelpBrowserType", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -233,7 +233,7 @@ gimp_histogram_scale_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpHistogramScale", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -273,7 +273,7 @@ gimp_tab_style_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpTabStyle", values);
gimp_enum_set_value_descriptions (type, descs);
......@@ -303,7 +303,7 @@ gimp_window_hint_get_type (void)
static GType type = 0;
if (! type)
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpWindowHint", values);
gimp_enum_set_value_descriptions (type, descs);
......
......@@ -395,7 +395,7 @@ gimpenums.c: $(srcdir)/gimpenums.h $(srcdir)/gimpenums.c.tail $(GIMP_MKENUMS)
--vtail " { 0, NULL, NULL }\n };\n" \