sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Don't call textdomain()

Browse source 
As a library, libmutter should not be setting the default translation
domain to point to itself.

Also, move the bindtextdomain() call earlier
(meta_get_option_context), so that translations of command-line
options will be available.

We could call textdomain() in mutter.c, but there's no need to, since
mutter uses dgettext() everywhere anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=649202
This commit is contained in:
Dan Winship 2011-05-02 11:55:14 -04:00
parent 3d05405a78
commit d9007a08c9
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/main.c
View file

@ -251,6 +251,11 @@ meta_get_option_context (void)
{ {
GOptionContext *ctx; GOptionContext *ctx;
if (setlocale (LC_ALL, "") == NULL)
meta_warning ("Locale not understood by C library, internationalization will not work\n");
bindtextdomain (GETTEXT_PACKAGE, MUTTER_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
ctx = g_option_context_new (NULL); ctx = g_option_context_new (NULL);
g_option_context_add_main_entries (ctx, meta_options, GETTEXT_PACKAGE); g_option_context_add_main_entries (ctx, meta_options, GETTEXT_PACKAGE);
g_option_context_add_group (ctx, clutter_get_option_group_without_init ()); g_option_context_add_group (ctx, clutter_get_option_group_without_init ());
@ -385,9 +390,6 @@ meta_init (void)
sigset_t empty_mask; sigset_t empty_mask;
GIOChannel *channel; GIOChannel *channel;
if (setlocale (LC_ALL, "") == NULL)
meta_warning ("Locale not understood by C library, internationalization will not work\n");
g_type_init (); g_type_init ();
sigemptyset (&empty_mask); sigemptyset (&empty_mask);
@ -430,10 +432,6 @@ meta_init (void)
meta_print_self_identity (); meta_print_self_identity ();
bindtextdomain (GETTEXT_PACKAGE, MUTTER_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#ifdef HAVE_INTROSPECTION #ifdef HAVE_INTROSPECTION
g_irepository_prepend_search_path (MUTTER_PKGLIBDIR); g_irepository_prepend_search_path (MUTTER_PKGLIBDIR);
#endif #endif