diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-08-01 13:52:29 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-01 13:52:29 +0000 |
| commit | 888e68c28d1ab860e291ce1b7473bde34454f7c7 (patch) | |
| tree | 61c95c7e8322b28b54fb702acf6d5fcc7a940086 /gtk | |
| parent | 2aec0359dbe1207b15c6a73232b2675dc7d7a7f6 (diff) | |
| download | gdk-pixbuf-888e68c28d1ab860e291ce1b7473bde34454f7c7.tar.gz | |
Call gettext_initialization() here as well. (#311612, Dan Winship)
2005-08-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c (do_post_parse_initialization): Call
gettext_initialization() here as well. (#311612, Dan Winship)
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkmain.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 07fd7a854..fbf975cba 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -449,12 +449,27 @@ do_pre_parse_initialization (int *argc, } static void +gettext_initialization (void) +{ +#ifdef ENABLE_NLS + bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE "-properties", GTK_LOCALEDIR); +# ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + bind_textdomain_codeset (GETTEXT_PACKAGE "-properties", "UTF-8"); +# endif +#endif +} + +static void do_post_parse_initialization (int *argc, char ***argv) { if (gtk_initialized) return; + gettext_initialization (); + if (g_fatal_warnings) { GLogLevelFlags fatal_mask; @@ -566,19 +581,6 @@ gtk_get_option_group (gboolean open_default_display) return group; } -static void -gettext_initialization (void) -{ -#ifdef ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR); - bindtextdomain (GETTEXT_PACKAGE "-properties", GTK_LOCALEDIR); -# ifdef HAVE_BIND_TEXTDOMAIN_CODESET - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bind_textdomain_codeset (GETTEXT_PACKAGE "-properties", "UTF-8"); -# endif -#endif -} - /** * gtk_init_with_args: * @argc: a pointer to the number of command line arguments. @@ -616,11 +618,11 @@ gtk_init_with_args (int *argc, GOptionGroup *gtk_group; gboolean retval; - gettext_initialization (); - if (gtk_initialized) return TRUE; + gettext_initialization (); + if (!check_setugid ()) return FALSE; @@ -663,11 +665,11 @@ gtk_parse_args (int *argc, GOptionContext *option_context; GOptionGroup *gtk_group; - gettext_initialization (); - if (gtk_initialized) return TRUE; + gettext_initialization (); + if (!check_setugid ()) return FALSE; |