aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv <[email protected]>2004-08-19 17:31:37 +0000
committerJan Djärv <[email protected]>2004-08-19 17:31:37 +0000
commit00267f94d1c7b303cd8ba1294e9d849f2888517c (patch)
tree2085bbf373b319d6e51f33e4d0f6737e570b6cf4
parentbb41f093dde33efca8a7d5baf6eb1c364ea684c4 (diff)
* xfns.c (x_set_name, x_set_title): Encode title to UTF8 before
passing it to gtk_window_set_title.
-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 2999a43f14..0ef292aae1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-19 Jan Dj,Ad(Brv <[email protected]>
+
+ * xfns.c (x_set_name, x_set_title): Encode title to UTF8 before
+ passing it to gtk_window_set_title.
+
2004-08-19 Kim F. Storm <[email protected]>
* process.c (wait_reading_process_input): Clean up.
diff --git a/src/xfns.c b/src/xfns.c
index dd8b4a4cb1..3f484f3935 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1651,7 +1651,7 @@ x_set_name (f, name, explicit)
}
#ifdef USE_GTK
gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
- SDATA (name));
+ SDATA (ENCODE_UTF_8 (name)));
#else /* not USE_GTK */
XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
#endif /* not USE_GTK */
@@ -1759,7 +1759,7 @@ x_set_title (f, name, old_name)
#ifdef USE_GTK
gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
- SDATA (name));
+ SDATA (ENCODE_UTF_8 (name)));
#else /* not USE_GTK */
XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
#endif /* not USE_GTK */