Permalink
Browse files

Remove I_() macro as it is confused by intltool for a translation marker

"intltool -m" incorrectly identifies I_() as marking strings for
translation and therefore causes "make check" to fail.
  • Loading branch information...
1 parent 45bd8c7 commit 07b7a58c37c92d23f3e726299506fac5be741e65 @thos thos committed Sep 10, 2010
Showing with 18 additions and 22 deletions.
  1. +4 −4 mx/mx-draggable.c
  2. +4 −4 mx/mx-droppable.c
  3. +2 −1 mx/mx-native-window.c
  4. +0 −2 mx/mx-private.h
  5. +3 −2 mx/mx-settings-provider.c
  6. +3 −3 mx/mx-stylable.c
  7. +2 −2 mx/mx-types.c
  8. +0 −4 po/POTFILES.skip
View
@@ -480,7 +480,7 @@ mx_draggable_base_init (gpointer g_iface)
g_object_interface_install_property (g_iface, pspec);
draggable_signals[DRAG_BEGIN] =
- g_signal_new (I_("drag-begin"),
+ g_signal_new (g_intern_static_string ("drag-begin"),
iface_type,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MxDraggableIface, drag_begin),
@@ -493,7 +493,7 @@ mx_draggable_base_init (gpointer g_iface)
CLUTTER_TYPE_MODIFIER_TYPE);
draggable_signals[DRAG_MOTION] =
- g_signal_new (I_("drag-motion"),
+ g_signal_new (g_intern_static_string ("drag-motion"),
iface_type,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MxDraggableIface, drag_motion),
@@ -504,7 +504,7 @@ mx_draggable_base_init (gpointer g_iface)
G_TYPE_FLOAT);
draggable_signals[DRAG_END] =
- g_signal_new (I_("drag-end"),
+ g_signal_new (g_intern_static_string ("drag-end"),
iface_type,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MxDraggableIface, drag_end),
@@ -533,7 +533,7 @@ mx_draggable_get_type (void)
};
our_type = g_type_register_static (G_TYPE_INTERFACE,
- I_("MxDraggable"),
+ g_intern_static_string ("MxDraggable"),
&draggable_info, 0);
g_type_interface_add_prerequisite (our_type, CLUTTER_TYPE_ACTOR);
View
@@ -294,7 +294,7 @@ mx_droppable_base_init (gpointer g_iface)
g_object_interface_install_property (g_iface, pspec);
droppable_signals[OVER_IN] =
- g_signal_new (I_("over-in"),
+ g_signal_new (g_intern_static_string ("over-in"),
iface_type,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MxDroppableIface, over_in),
@@ -304,7 +304,7 @@ mx_droppable_base_init (gpointer g_iface)
CLUTTER_TYPE_ACTOR);
droppable_signals[OVER_OUT] =
- g_signal_new (I_("over-out"),
+ g_signal_new (g_intern_static_string ("over-out"),
iface_type,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MxDroppableIface, over_out),
@@ -314,7 +314,7 @@ mx_droppable_base_init (gpointer g_iface)
CLUTTER_TYPE_ACTOR);
droppable_signals[DROP] =
- g_signal_new (I_("drop"),
+ g_signal_new (g_intern_static_string ("drop"),
iface_type,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MxDroppableIface, drop),
@@ -347,7 +347,7 @@ mx_droppable_get_type (void)
};
our_type = g_type_register_static (G_TYPE_INTERFACE,
- I_("MxDroppable"),
+ g_intern_static_string ("MxDroppable"),
&droppable_info, 0);
g_type_interface_add_prerequisite (our_type, CLUTTER_TYPE_ACTOR);
View
@@ -62,7 +62,8 @@ _mx_native_window_get_type (void)
};
native_window_type =
- g_type_register_static (G_TYPE_INTERFACE, I_("MxNativeWindow"),
+ g_type_register_static (G_TYPE_INTERFACE,
+ g_intern_static_string ("MxNativeWindow"),
&native_window_info, 0);
g_type_interface_add_prerequisite (native_window_type,
View
@@ -29,8 +29,6 @@
G_BEGIN_DECLS
-#define I_(str) (g_intern_static_string ((str)))
-
#define MX_PARAM_READABLE \
(G_PARAM_READABLE | \
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
@@ -52,7 +52,7 @@ mx_settings_provider_base_init (gpointer g_iface)
g_object_interface_install_property (g_iface, pspec);
signals[SETTING_CHANGED] =
- g_signal_new (I_("setting-changed"),
+ g_signal_new (g_intern_static_string ("setting-changed"),
iface_type,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (MxSettingsProviderIface,
@@ -77,7 +77,8 @@ _mx_settings_provider_get_type (void)
};
settings_provider_type =
- g_type_register_static (G_TYPE_INTERFACE, I_("MxSettingsProvider"),
+ g_type_register_static (G_TYPE_INTERFACE,
+ g_intern_static_string ("MxSettingsProvider"),
&settings_provider_info, 0);
g_type_interface_add_prerequisite (settings_provider_type,
View
@@ -156,7 +156,7 @@ mx_stylable_base_init (gpointer g_iface)
* properties have changed.
*/
stylable_signals[STYLE_CHANGED] =
- g_signal_new (I_("style-changed"),
+ g_signal_new (g_intern_static_string ("style-changed"),
iface_type,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MxStylableIface, style_changed),
@@ -166,7 +166,7 @@ mx_stylable_base_init (gpointer g_iface)
#if 0
stylable_signals[STYLE_NOTIFY] =
- g_signal_new (I_("style-notify"),
+ g_signal_new (g_intern_static_string ("style-notify"),
iface_type,
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED
| G_SIGNAL_NO_HOOKS | G_SIGNAL_ACTION,
@@ -192,7 +192,7 @@ mx_stylable_get_type (void)
};
our_type = g_type_register_static (G_TYPE_INTERFACE,
- I_("MxStylable"),
+ g_intern_static_string ("MxStylable"),
&stylable_info, 0);
}
View
@@ -120,7 +120,7 @@ mx_padding_get_type (void)
static GType our_type = 0;
if (G_UNLIKELY (our_type == 0))
- our_type = g_boxed_type_register_static (I_("MxPadding"),
+ our_type = g_boxed_type_register_static (g_intern_static_string ("MxPadding"),
mx_padding_copy,
mx_padding_free);
@@ -239,7 +239,7 @@ mx_border_image_get_type (void)
if (G_UNLIKELY (our_type == 0))
our_type =
- g_boxed_type_register_static (I_("MxBorderImage"),
+ g_boxed_type_register_static (g_intern_static_string ("MxBorderImage"),
(GBoxedCopyFunc) mx_border_image_copy,
(GBoxedFreeFunc) mx_border_image_free);
View
@@ -1,5 +1 @@
-mx/mx-draggable.c
-mx/mx-droppable.c
-mx/mx-stylable.c
-mx/mx-types.c

0 comments on commit 07b7a58

Please sign in to comment.