From 87a9232d8a1bb32033e5331018568af0bbde757f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 24 Dec 2007 14:52:41 +0000 Subject: [PATCH] 2007-12-24 Emmanuele Bassi * 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 --- ChangeLog | 9 +++++++++ clutter/clutter-color.c | 2 +- clutter/clutter-enum-types.c.in | 6 +++--- clutter/clutter-event.c | 2 +- clutter/clutter-stage.c | 4 ++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c17e0195..178edcfd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-12-24 Emmanuele Bassi + + * 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 * clutter.symbols: Add clutter_actor_set_clipu() and diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c index 11722bb0d..d5bdbdf81 100644 --- 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) - 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; diff --git a/clutter/clutter-enum-types.c.in b/clutter/clutter-enum-types.c.in index 98e29da43..035919ba5 100644 --- 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) { - 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 ***/ @@ -23,7 +23,7 @@ GType /*** 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; } diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c index 34cc45bd7..f7157f394 100644 --- 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) - 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; diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c index 1e398b70c..d74cc0b3a 100644 --- a/clutter/clutter-stage.c +++ b/clutter/clutter-stage.c @@ -1291,7 +1291,7 @@ clutter_perspective_get_type (void) 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; @@ -1324,7 +1324,7 @@ clutter_fog_get_type (void) 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);