diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-07-18 17:13:24 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-07-18 17:13:24 +0000 |
| commit | b2d302ee131187ce0cd1976eca0c586d9cf46a9e (patch) | |
| tree | 98fc13d8d312ed57642f13cda336665a56ee17f4 /gtk/gtkmain.c | |
| parent | 80d2565d1c9409618eedc4654ce55e96e14f5b10 (diff) | |
| download | gtk+-b2d302ee131187ce0cd1976eca0c586d9cf46a9e.tar.gz | |
Call gettext_initialization before checking gtk_initialized, otherwise
2005-07-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
gettext_initialization before checking gtk_initialized, otherwise
there are scenarios where it is not called at all. For an
example, see tests/testfilechooserbutton.c. (#310323,
Arkady L. Shane)
Diffstat (limited to 'gtk/gtkmain.c')
| -rw-r--r-- | gtk/gtkmain.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index bd42c7ea41..49817a9050 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -616,14 +616,14 @@ gtk_init_with_args (int *argc, GOptionGroup *gtk_group; gboolean retval; + gettext_initialization (); + if (gtk_initialized) return TRUE; if (!check_setugid ()) return FALSE; - gettext_initialization (); - gtk_group = gtk_get_option_group (TRUE); context = g_option_context_new (parameter_string); @@ -663,14 +663,14 @@ gtk_parse_args (int *argc, GOptionContext *option_context; GOptionGroup *gtk_group; + gettext_initialization (); + if (gtk_initialized) return TRUE; if (!check_setugid ()) return FALSE; - gettext_initialization (); - option_context = g_option_context_new (NULL); g_option_context_set_ignore_unknown_options (option_context, TRUE); g_option_context_set_help_enabled (option_context, FALSE); |