[Emacs-diffs] /srv/bzr/emacs/trunk r110157: * xterm.c (x_term_init): Call fixup_locale before and after calling

[Jan D.]

------------------------------------------------------------
revno: 110157
fixes bug: http://debbugs.gnu.org/12392
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-23 12:03:35 +0200
message:
  * xterm.c (x_term_init): Call fixup_locale before and after calling
  gtk_init.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-23 09:22:38 +0000
+++ b/src/ChangeLog     2012-09-23 10:03:35 +0000
@@ -1,3 +1,8 @@
+2012-09-23  Jan Djärv  <address@hidden>
+
+       * xterm.c (x_term_init): Call fixup_locale before and after calling
+       gtk_init (Bug#12392).
+
 2012-09-23  Chong Yidong  <address@hidden>
 
        * w32.c (w32_delayed_load): Remove LIBRARIES argument; always use

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-09-23 08:44:20 +0000
+++ b/src/xterm.c       2012-09-23 10:03:35 +0000
@@ -9957,11 +9957,13 @@
            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 ();