GNOME.org
 

gimp r27538 - in trunk: . app/base app/core app/display app/paint app/plug-in app/text app/tools app/widgets libgimp libgimpbase libgimpconfig libgimpthumb libgimpwidgets

Author: neo
Date: Mon Nov  3 21:38:13 2008
New Revision: 27538
URL: http://svn.gnome.org/viewvc/gimp?rev=27538&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/app/base/Makefile.am
   trunk/app/base/base-enums.c
   trunk/app/core/Makefile.am
   trunk/app/core/core-enums.c
   trunk/app/display/Makefile.am
   trunk/app/display/display-enums.c
   trunk/app/paint/Makefile.am
   trunk/app/paint/paint-enums.c
   trunk/app/plug-in/Makefile.am
   trunk/app/plug-in/plug-in-enums.c
   trunk/app/text/Makefile.am
   trunk/app/text/text-enums.c
   trunk/app/tools/Makefile.am
   trunk/app/tools/tools-enums.c
   trunk/app/widgets/Makefile.am
   trunk/app/widgets/widgets-enums.c
   trunk/libgimp/Makefile.am
   trunk/libgimpbase/Makefile.am
   trunk/libgimpbase/gimpbaseenums.c
   trunk/libgimpconfig/Makefile.am
   trunk/libgimpconfig/gimpcolorconfig-enums.c
   trunk/libgimpthumb/Makefile.am
   trunk/libgimpwidgets/Makefile.am
   trunk/libgimpwidgets/gimpwidgetsenums.c

Modified: trunk/app/base/Makefile.am
==============================================================================
--- trunk/app/base/Makefile.am	(original)
+++ trunk/app/base/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -92,7 +92,7 @@
 		--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

Modified: trunk/app/base/base-enums.c
==============================================================================
--- trunk/app/base/base-enums.c	(original)
+++ trunk/app/base/base-enums.c	Mon Nov  3 21:38:13 2008
@@ -27,7 +27,7 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpHueRange", values);
       gimp_enum_set_value_descriptions (type, descs);

Modified: trunk/app/core/Makefile.am
==============================================================================
--- trunk/app/core/Makefile.am	(original)
+++ trunk/app/core/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -373,7 +373,7 @@
 		--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

Modified: trunk/app/core/core-enums.c
==============================================================================
--- trunk/app/core/core-enums.c	(original)
+++ trunk/app/core/core-enums.c	Mon Nov  3 21:38:13 2008
@@ -27,7 +27,7 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpColorProfilePolicy", values);
       gimp_enum_set_value_descriptions (type, descs);

Modified: trunk/app/display/Makefile.am
==============================================================================
--- trunk/app/display/Makefile.am	(original)
+++ trunk/app/display/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -104,7 +104,7 @@
 		--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

Modified: trunk/app/display/display-enums.c
==============================================================================
--- trunk/app/display/display-enums.c	(original)
+++ trunk/app/display/display-enums.c	Mon Nov  3 21:38:13 2008
@@ -29,7 +29,7 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpZoomFocus", values);
       gimp_enum_set_value_descriptions (type, descs);

Modified: trunk/app/paint/Makefile.am
==============================================================================
--- trunk/app/paint/Makefile.am	(original)
+++ trunk/app/paint/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -101,7 +101,7 @@
 		--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

Modified: trunk/app/paint/paint-enums.c
==============================================================================
--- trunk/app/paint/paint-enums.c	(original)
+++ trunk/app/paint/paint-enums.c	Mon Nov  3 21:38:13 2008
@@ -27,7 +27,7 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpInkBlobType", values);
       gimp_enum_set_value_descriptions (type, descs);

Modified: trunk/app/plug-in/Makefile.am
==============================================================================
--- trunk/app/plug-in/Makefile.am	(original)
+++ trunk/app/plug-in/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -96,7 +96,7 @@
 		--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

Modified: trunk/app/plug-in/plug-in-enums.c
==============================================================================
--- trunk/app/plug-in/plug-in-enums.c	(original)
+++ trunk/app/plug-in/plug-in-enums.c	Mon Nov  3 21:38:13 2008
@@ -35,7 +35,7 @@
 
   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 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpPlugInCallMode", values);
       gimp_enum_set_value_descriptions (type, descs);

Modified: trunk/app/text/Makefile.am
==============================================================================
--- trunk/app/text/Makefile.am	(original)
+++ trunk/app/text/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -74,7 +74,7 @@
 		--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

Modified: trunk/app/text/text-enums.c
==============================================================================
--- trunk/app/text/text-enums.c	(original)
+++ trunk/app/text/text-enums.c	Mon Nov  3 21:38:13 2008
@@ -27,7 +27,7 @@
 
   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 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpTextOutline", values);
       gimp_enum_set_value_descriptions (type, descs);

Modified: trunk/app/tools/Makefile.am
==============================================================================
--- trunk/app/tools/Makefile.am	(original)
+++ trunk/app/tools/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -213,7 +213,7 @@
 		--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

Modified: trunk/app/tools/tools-enums.c
==============================================================================
--- trunk/app/tools/tools-enums.c	(original)
+++ trunk/app/tools/tools-enums.c	Mon Nov  3 21:38:13 2008
@@ -32,7 +32,7 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpVectorMode", values);
       gimp_enum_set_value_descriptions (type, descs);

Modified: trunk/app/widgets/Makefile.am
==============================================================================
--- trunk/app/widgets/Makefile.am	(original)
+++ trunk/app/widgets/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -375,7 +375,7 @@
 		--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

Modified: trunk/app/widgets/widgets-enums.c
==============================================================================
--- trunk/app/widgets/widgets-enums.c	(original)
+++ trunk/app/widgets/widgets-enums.c	Mon Nov  3 21:38:13 2008
@@ -27,7 +27,7 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   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 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpWindowHint", values);
       gimp_enum_set_value_descriptions (type, descs);

Modified: trunk/libgimp/Makefile.am
==============================================================================
--- trunk/libgimp/Makefile.am	(original)
+++ trunk/libgimp/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -395,7 +395,7 @@
 		--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_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\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_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n      gimp_ type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
 		$(srcdir)/gimpenums.h > xgen-cec \
 	&& cat $(srcdir)/gimpenums.c.tail >> xgen-cec \
 	&& cp xgen-cec $(@F) \

Modified: trunk/libgimpbase/Makefile.am
==============================================================================
--- trunk/libgimpbase/Makefile.am	(original)
+++ trunk/libgimpbase/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -193,7 +193,7 @@
 		--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_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\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_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n      gimp_ type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
 		$(srcdir)/gimpbaseenums.h > xgen-bec \
 	&& cp xgen-bec $(@F) \
 	&& rm -f xgen-bec

Modified: trunk/libgimpbase/gimpbaseenums.c
==============================================================================
--- trunk/libgimpbase/gimpbaseenums.c	(original)
+++ trunk/libgimpbase/gimpbaseenums.c	Mon Nov  3 21:38:13 2008
@@ -37,7 +37,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpAddMaskType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -70,7 +70,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpBlendMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -101,7 +101,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpBucketFillMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -134,7 +134,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpChannelOps", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -171,7 +171,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpChannelType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -202,7 +202,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpCheckSize", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -239,7 +239,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpCheckType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -268,7 +268,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpCloneType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -299,7 +299,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpDesaturateMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -328,7 +328,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpDodgeBurnType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -355,7 +355,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpForegroundExtractMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -402,7 +402,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpGradientType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -437,7 +437,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpGridStyle", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -468,7 +468,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpIconType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -499,7 +499,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpImageBaseType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -536,7 +536,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpImageType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -569,7 +569,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpInterpolationType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -598,7 +598,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpPaintApplicationMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -629,7 +629,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpRepeatMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -660,7 +660,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpRunMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -689,7 +689,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpSizeType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -720,7 +720,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpTransferMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -749,7 +749,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpTransformDirection", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -782,7 +782,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpTransformResize", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -853,7 +853,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpPDBArgType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -882,7 +882,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpPDBErrorHandler", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -915,7 +915,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpPDBProcType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -950,7 +950,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpPDBStatusType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -981,7 +981,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpMessageHandlerType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -1012,7 +1012,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpStackTraceMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -1049,7 +1049,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpProgressCommand", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -1078,7 +1078,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpTextDirection", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -1111,7 +1111,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpTextHintStyle", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -1144,7 +1144,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpTextJustification", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -1185,7 +1185,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpUserDirectory", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -1212,7 +1212,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpVectorsStrokeType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");

Modified: trunk/libgimpconfig/Makefile.am
==============================================================================
--- trunk/libgimpconfig/Makefile.am	(original)
+++ trunk/libgimpconfig/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -139,7 +139,7 @@
 		--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_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\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_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n      gimp_ type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
 		$(srcdir)/gimpcolorconfig-enums.h > xgen-cec \
 	&& cp xgen-cec $(@F) \
 	&& rm -f xgen-cec

Modified: trunk/libgimpconfig/gimpcolorconfig-enums.c
==============================================================================
--- trunk/libgimpconfig/gimpcolorconfig-enums.c	(original)
+++ trunk/libgimpconfig/gimpcolorconfig-enums.c	Mon Nov  3 21:38:13 2008
@@ -29,7 +29,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpColorManagementMode", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -62,7 +62,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpColorRenderingIntent", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");

Modified: trunk/libgimpthumb/Makefile.am
==============================================================================
--- trunk/libgimpthumb/Makefile.am	(original)
+++ trunk/libgimpthumb/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -107,7 +107,7 @@
 		--fprod "\n/* enumerations from \"@filename \" */" \
 		--vhead "GType\n enum_name@_get_type (void)\n{\n  static const G Type@Value values[] =\n  {" \
 		--vprod "    { @VALUENAME@, @valuedesc@, \"@valuenick \" }," \
-		--vtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (! type)\n    type = g_ type@_register_static (\"@EnumName \", values);\n\n  return type;\n}\n" \
+		--vtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    type = g_ type@_register_static (\"@EnumName \", values);\n\n  return type;\n}\n" \
 		$(srcdir)/gimpthumb-enums.h > xgen-tec \
 	&& cp xgen-tec $(@F) \
 	&& rm -f xgen-tec

Modified: trunk/libgimpwidgets/Makefile.am
==============================================================================
--- trunk/libgimpwidgets/Makefile.am	(original)
+++ trunk/libgimpwidgets/Makefile.am	Mon Nov  3 21:38:13 2008
@@ -293,7 +293,7 @@
 		--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_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\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_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n      gimp_ type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
 		$(srcdir)/gimpwidgetsenums.h > xgen-wec \
 	&& cp xgen-wec $(@F) \
 	&& rm -f xgen-wec

Modified: trunk/libgimpwidgets/gimpwidgetsenums.c
==============================================================================
--- trunk/libgimpwidgets/gimpwidgetsenums.c	(original)
+++ trunk/libgimpwidgets/gimpwidgetsenums.c	Mon Nov  3 21:38:13 2008
@@ -29,7 +29,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpAspectType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -62,7 +62,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpChainPosition", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -93,7 +93,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpColorAreaType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -132,7 +132,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpColorSelectorChannel", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -161,7 +161,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpPageSelectorTarget", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -192,7 +192,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpSizeEntryUpdatePolicy", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
@@ -221,7 +221,7 @@
 
   static GType type = 0;
 
-  if (! type)
+  if (G_UNLIKELY (! type))
     {
       type = g_enum_register_static ("GimpZoomType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]