[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c,v [EMACS_22_BASE]
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c,v [EMACS_22_BASE] |
Date: |
Sat, 02 Jun 2007 04:01:52 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Chong Yidong <cyd> 07/06/02 04:01:51
Index: xfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfns.c,v
retrieving revision 1.681.2.2
retrieving revision 1.681.2.3
diff -u -b -r1.681.2.2 -r1.681.2.3
--- xfns.c 1 Jun 2007 12:14:34 -0000 1.681.2.2
+++ xfns.c 2 Jun 2007 04:01:51 -0000 1.681.2.3
@@ -1607,20 +1607,22 @@
BLOCK_INPUT;
#ifdef HAVE_X11R4
{
+ XTextProperty text, icon;
+ 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
- gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
- (char *) SDATA (encoded_name));
-#else /* not USE_GTK */
- XTextProperty text, icon;
- int bytes, stringp;
- int do_free_icon_value = 0, do_free_text_value = 0;
- Lisp_Object coding_system;
coding_system = Qcompound_text;
-
/* Note: Encoding strategy
We encode NAME by compound-text and use "COMPOUND-TEXT" in
@@ -1657,7 +1659,12 @@
icon.nitems = bytes;
}
+#ifdef USE_GTK
+ gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+ (char *) SDATA (encoded_name));
+#else /* not USE_GTK */
XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
+#endif /* not USE_GTK */
XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &icon);
@@ -1665,7 +1672,6 @@
xfree (icon.value);
if (do_free_text_value)
xfree (text.value);
-#endif /* not USE_GTK */
}
#else /* not HAVE_X11R4 */
XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),