aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2004-08-19 17:31:37 +0000
committerJan Djärv2004-08-19 17:31:37 +0000
commit00267f94d1c7b303cd8ba1294e9d849f2888517c (patch)
tree2085bbf373b319d6e51f33e4d0f6737e570b6cf4 /src
parentbb41f093dde33efca8a7d5baf6eb1c364ea684c4 (diff)
downloademacs-00267f94d1c7b303cd8ba1294e9d849f2888517c.tar.gz
emacs-00267f94d1c7b303cd8ba1294e9d849f2888517c.zip
* xfns.c (x_set_name, x_set_title): Encode title to UTF8 before
passing it to gtk_window_set_title.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2999a43f14d..0ef292aae16 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-08-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xfns.c (x_set_name, x_set_title): Encode title to UTF8 before
4 passing it to gtk_window_set_title.
5
12004-08-19 Kim F. Storm <storm@cua.dk> 62004-08-19 Kim F. Storm <storm@cua.dk>
2 7
3 * process.c (wait_reading_process_input): Clean up. 8 * process.c (wait_reading_process_input): Clean up.
diff --git a/src/xfns.c b/src/xfns.c
index dd8b4a4cb12..3f484f3935a 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1651,7 +1651,7 @@ x_set_name (f, name, explicit)
1651 } 1651 }
1652#ifdef USE_GTK 1652#ifdef USE_GTK
1653 gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), 1653 gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
1654 SDATA (name)); 1654 SDATA (ENCODE_UTF_8 (name)));
1655#else /* not USE_GTK */ 1655#else /* not USE_GTK */
1656 XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text); 1656 XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
1657#endif /* not USE_GTK */ 1657#endif /* not USE_GTK */
@@ -1759,7 +1759,7 @@ x_set_title (f, name, old_name)
1759 1759
1760#ifdef USE_GTK 1760#ifdef USE_GTK
1761 gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), 1761 gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
1762 SDATA (name)); 1762 SDATA (ENCODE_UTF_8 (name)));
1763#else /* not USE_GTK */ 1763#else /* not USE_GTK */
1764 XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text); 1764 XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
1765#endif /* not USE_GTK */ 1765#endif /* not USE_GTK */