diff options
Diffstat (limited to 'cogl')
-rw-r--r-- | cogl/cogl-debug.c | 4 | ||||
-rw-r--r-- | cogl/cogl-i18n-private.h | 6 | ||||
-rw-r--r-- | cogl/cogl-profile.c | 8 | ||||
-rw-r--r-- | cogl/cogl-util.h | 2 | ||||
-rw-r--r-- | cogl/cogl.c | 5 |
5 files changed, 7 insertions, 18 deletions
diff --git a/cogl/cogl-debug.c b/cogl/cogl-debug.c index 446313c01..345406c91 100644 --- a/cogl/cogl-debug.c +++ b/cogl/cogl-debug.c @@ -180,8 +180,7 @@ _cogl_parse_debug_string (const char *value, { g_printerr ("\n\n%28s\n", _("Supported debug values:")); #define OPT(MASK_NAME, GROUP, NAME, NAME_FORMATTED, DESCRIPTION) \ - g_printerr ("%28s %s\n", NAME ":", g_dgettext (GETTEXT_PACKAGE, \ - DESCRIPTION)); + g_printerr ("%28s %s\n", NAME ":", DESCRIPTION); #include "cogl-debug-options.h" g_printerr ("\n%28s\n", _("Special debug values:")); OPT (IGNORED, "ignored", "all", "ignored", \ @@ -298,7 +297,6 @@ cogl_get_option_group (void) g_option_group_set_parse_hooks (group, pre_parse_hook, NULL); g_option_group_add_entries (group, cogl_args); - g_option_group_set_translation_domain (group, GETTEXT_PACKAGE); return group; } diff --git a/cogl/cogl-i18n-private.h b/cogl/cogl-i18n-private.h index f77a34309..94202f791 100644 --- a/cogl/cogl-i18n-private.h +++ b/cogl/cogl-i18n-private.h @@ -31,11 +31,9 @@ #ifndef _COGL_I18N_PRIVATE_H_ #define _COGL_I18N_PRIVATE_H_ -#ifdef ENABLE_NLS -#include <glib/gi18n-lib.h> -#else +#include <string.h> + #define _(X) X #define N_(X) X -#endif #endif /* _COGL_I18N_PRIVATE_H_ */ diff --git a/cogl/cogl-profile.c b/cogl/cogl-profile.c index ce687a204..766e271ed 100644 --- a/cogl/cogl-profile.c +++ b/cogl/cogl-profile.c @@ -93,12 +93,10 @@ _cogl_uprof_init (void) G_STMT_START { \ int shift = COGL_DEBUG_ ## MASK_NAME; \ uprof_context_add_boolean_option (_cogl_uprof_context, \ - g_dgettext (GETTEXT_PACKAGE, GROUP), \ + GROUP, \ NAME, \ - g_dgettext (GETTEXT_PACKAGE, \ - NAME_FORMATTED), \ - g_dgettext (GETTEXT_PACKAGE, \ - DESCRIPTION), \ + NAME_FORMATTED, \ + DESCRIPTION, \ debug_option_getter, \ debug_option_setter, \ GUINT_TO_POINTER (shift)); \ diff --git a/cogl/cogl-util.h b/cogl/cogl-util.h index 6df879d4b..160c97888 100644 --- a/cogl/cogl-util.h +++ b/cogl/cogl-util.h @@ -42,7 +42,7 @@ #endif /* Double check that config.h has been included */ -#if !defined (GETTEXT_PACKAGE) && !defined (_COGL_IN_TEST_BITMASK) +#if !defined (PACKAGE_NAME) && !defined (_COGL_IN_TEST_BITMASK) #error "config.h must be included before including cogl-util.h" #endif diff --git a/cogl/cogl.c b/cogl/cogl.c index 577ae72fb..e4e780857 100644 --- a/cogl/cogl.c +++ b/cogl/cogl.c @@ -757,11 +757,6 @@ _cogl_init (void) if (initialized == FALSE) { -#ifdef ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, COGL_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -#endif - #if defined(COGL_HAS_GTYPE_SUPPORT) && !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); #endif |