[Emacs-diffs] Changes to emacs/src/xfns.c,v [EMACS_22_BASE]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Chong Yidong <cyd>      07/06/01 03:58:05

Index: xfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfns.c,v
retrieving revision 1.681
retrieving revision 1.681.2.1
diff -u -b -r1.681 -r1.681.2.1
--- xfns.c      24 Mar 2007 15:40:38 -0000      1.681
+++ xfns.c      1 Jun 2007 03:58:05 -0000       1.681.2.1
@@ -1605,6 +1605,16 @@
        int bytes, stringp;
         int do_free_icon_value = 0, do_free_text_value = 0;
        Lisp_Object coding_system;
+#ifdef USE_GTK
+       Lisp_Object encoded_name;
+       struct gcpro gcpro1;
+
+       /* As ENCODE_UTF_8 may cause GC and relocation of string data,
+          we use it before x_encode_text that may return string data.  */
+       GCPRO1 (name);
+       encoded_name = ENCODE_UTF_8 (name);
+       UNGCPRO;
+#endif
 
        coding_system = Qcompound_text;
        /* Note: Encoding strategy
@@ -1645,7 +1655,7 @@
 
 #ifdef USE_GTK
         gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                              (char *) SDATA (ENCODE_UTF_8 (name)));
+                              (char *) SDATA (encoded_name));
 #else /* not USE_GTK */
        XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
 #endif /* not USE_GTK */