Commit 888e68c2 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

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)
parent 2aec0359
2005-08-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c (do_post_parse_initialization): Call
gettext_initialization() here as well. (#311612, Dan Winship)
2005-08-01 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_urgency_hint):
......
2005-08-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c (do_post_parse_initialization): Call
gettext_initialization() here as well. (#311612, Dan Winship)
2005-08-01 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_urgency_hint):
......
2005-08-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c (do_post_parse_initialization): Call
gettext_initialization() here as well. (#311612, Dan Winship)
2005-08-01 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_urgency_hint):
......
......@@ -448,6 +448,19 @@ do_pre_parse_initialization (int *argc,
gtk_modules_string = g_string_new (env_string);
}
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)
......@@ -455,6 +468,8 @@ do_post_parse_initialization (int *argc,
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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment