* xterm.c (x_term_init): Call fixup_locale before and after calling

gtk_init.

Fixes: debbugs:12392

diff --git a/src/ChangeLog b/src/ChangeLog
index d03e208354d81662f460b1eada3f8a0d86ad37e7..0448dab3cabf31d3f40f508805251798626d8c9d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xterm.c (x_term_init): Call fixup_locale before and after calling
+       gtk_init (Bug#12392).
+
 2012-09-23  Chong Yidong  <cyd@gnu.org>
 
        * w32.c (w32_delayed_load): Remove LIBRARIES argument; always use

diff --git a/src/xterm.c b/src/xterm.c
index 5b34cc39815e23265d0a8c63c0f0e1fbfd19aa4c..15a78147d24ec15c280c7112f612e3e84cf07bd8 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9957,11 +9957,13 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
            Call before gtk_init so Gtk+ event filters comes after our.  */
         gdk_window_add_filter (NULL, event_handler_gdk, NULL);
 
+        /* gtk_init does set_locale.  Fix locale before and after.  */
+        fixup_locale ();
         gtk_init (&argc, &argv2);
+        fixup_locale ();
+
         g_log_remove_handler ("GLib", id);
 
-        /* gtk_init does set_locale.  We must fix locale after calling it.  */
-        fixup_locale ();
         xg_initialize ();
 
         dpy = DEFAULT_GDK_DISPLAY ();