AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Call gettext_initialization before checking gtk_initialized, otherwise

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2005-07-18 17:13:24 +00:00 committed by Matthias Clasen
parent 80d2565d1c
commit b2d302ee13
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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)
2005-07-18 Tor Lillqvist <tml@novell.com> 2005-07-18 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
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)
2005-07-18 Tor Lillqvist <tml@novell.com> 2005-07-18 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
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)
2005-07-18 Tor Lillqvist <tml@novell.com> 2005-07-18 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove

8
gtk/gtkmain.c
View File

@ -616,14 +616,14 @@ gtk_init_with_args (int *argc,
GOptionGroup *gtk_group; GOptionGroup *gtk_group;
gboolean retval; gboolean retval;
gettext_initialization ();
if (gtk_initialized) if (gtk_initialized)
return TRUE; return TRUE;
if (!check_setugid ()) if (!check_setugid ())
return FALSE; return FALSE;
gettext_initialization ();
gtk_group = gtk_get_option_group (TRUE); gtk_group = gtk_get_option_group (TRUE);
context = g_option_context_new (parameter_string); context = g_option_context_new (parameter_string);
@ -663,14 +663,14 @@ gtk_parse_args (int *argc,
GOptionContext *option_context; GOptionContext *option_context;
GOptionGroup *gtk_group; GOptionGroup *gtk_group;
gettext_initialization ();
if (gtk_initialized) if (gtk_initialized)
return TRUE; return TRUE;
if (!check_setugid ()) if (!check_setugid ())
return FALSE; return FALSE;
gettext_initialization ();
option_context = g_option_context_new (NULL); option_context = g_option_context_new (NULL);
g_option_context_set_ignore_unknown_options (option_context, TRUE); g_option_context_set_ignore_unknown_options (option_context, TRUE);
g_option_context_set_help_enabled (option_context, FALSE); g_option_context_set_help_enabled (option_context, FALSE);