2007-12-24 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-color.c:
	* clutter/clutter-event.c:
	* clutter/clutter-stage.c: Intern more strings using the I_() macro

	* clutter/clutter-enum-types.c.in: Call g_intern_static_string()
	in the enum types template

diff --git a/ChangeLog b/ChangeLog
index 3c17e01..178edcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2007-12-24  Emmanuele Bassi  <ebassi@openedhand.com>
 
 2007-12-24  Emmanuele Bassi  <ebassi@openedhand.com>
 

+       * clutter/clutter-color.c:
+       * clutter/clutter-event.c:
+       * clutter/clutter-stage.c: Intern more strings using the I_() macro
+
+       * clutter/clutter-enum-types.c.in: Call g_intern_static_string()
+       in the enum types template
+
+2007-12-24  Emmanuele Bassi  <ebassi@openedhand.com>
+

        * clutter.symbols: Add clutter_actor_set_clipu() and
        clutter_actor_get_clipu()
 
        * clutter.symbols: Add clutter_actor_set_clipu() and
        clutter_actor_get_clipu()
 

diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c
index 11722bb..d5bdbdf 100644 (file)
--- a/clutter/clutter-color.c
+++ b/clutter/clutter-color.c
@@ -621,7 +621,7 @@ clutter_color_get_type (void)
   static GType our_type = 0;
   
   if (!our_type)
   static GType our_type = 0;
   
   if (!our_type)

-    our_type = g_boxed_type_register_static ("ClutterColor",
+    our_type = g_boxed_type_register_static (I_("ClutterColor"),

                                             (GBoxedCopyFunc) clutter_color_copy,
                                             (GBoxedFreeFunc) clutter_color_free);
   return our_type;
                                             (GBoxedCopyFunc) clutter_color_copy,
                                             (GBoxedFreeFunc) clutter_color_free);
   return our_type;

diff --git a/clutter/clutter-enum-types.c.in b/clutter/clutter-enum-types.c.in
index 98e29da..035919b 100644 (file)
--- a/clutter/clutter-enum-types.c.in
+++ b/clutter/clutter-enum-types.c.in
@@ -10,8 +10,8 @@
 /*** BEGIN value-header ***/
 GType
 @enum_name@_get_type(void) {
 /*** BEGIN value-header ***/
 GType
 @enum_name@_get_type(void) {

-  static GType enum_type_id = 0;
-  if (G_UNLIKELY (!enum_type_id))
+  static GType etype = 0;
+  if (G_UNLIKELY (!etype))

     {
       static const G@Type@Value values[] = {
 /*** END value-header ***/
     {
       static const G@Type@Value values[] = {
 /*** END value-header ***/


@@ -23,7 +23,7 @@ GType
 /*** BEGIN value-tail ***/
         { 0, NULL, NULL }
       };
 /*** BEGIN value-tail ***/
         { 0, NULL, NULL }
       };

-      enum_type_id = g_@type@_register_static("@EnumName@", values);
+      etype = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);

     }
   return enum_type_id;
 }
     }
   return enum_type_id;
 }

diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c
index 34cc45b..f7157f3 100644 (file)
--- a/clutter/clutter-event.c
+++ b/clutter/clutter-event.c
@@ -298,7 +298,7 @@ clutter_event_get_type (void)
   static GType our_type = 0;
 
   if (!our_type)
   static GType our_type = 0;
 
   if (!our_type)

-    our_type = g_boxed_type_register_static ("ClutterEvent",
+    our_type = g_boxed_type_register_static (I_("ClutterEvent"),

                                             (GBoxedCopyFunc) clutter_event_copy,
                                             (GBoxedFreeFunc) clutter_event_free);
   return our_type;
                                             (GBoxedCopyFunc) clutter_event_copy,
                                             (GBoxedFreeFunc) clutter_event_free);
   return our_type;

diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 1e398b7..d74cc0b 100644 (file)
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -1291,7 +1291,7 @@ clutter_perspective_get_type (void)
 
   if (!our_type)
     our_type =
 
   if (!our_type)
     our_type =

-      g_boxed_type_register_static ("ClutterPerspective",
+      g_boxed_type_register_static (I_("ClutterPerspective"),

                                     (GBoxedCopyFunc) clutter_perspective_copy,
                                     (GBoxedFreeFunc) clutter_perspective_free);
   return our_type;
                                     (GBoxedCopyFunc) clutter_perspective_copy,
                                     (GBoxedFreeFunc) clutter_perspective_free);
   return our_type;


@@ -1324,7 +1324,7 @@ clutter_fog_get_type (void)
 
   if (G_UNLIKELY (our_type == 0))
     our_type =
 
   if (G_UNLIKELY (our_type == 0))
     our_type =

-      g_boxed_type_register_static ("ClutterFog",
+      g_boxed_type_register_static (I_("ClutterFog"),

                                     (GBoxedCopyFunc) clutter_fog_copy,
                                     (GBoxedFreeFunc) clutter_fog_free);
 
                                     (GBoxedCopyFunc) clutter_fog_copy,
                                     (GBoxedFreeFunc) clutter_fog_free);