From 696ef85e645c877d30c0810739fb6431a3850636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Crozat?= Date: Fri, 3 Aug 2007 07:43:03 +0000 Subject: [PATCH] Fix mangled window title in "Force Quit" dialog when using non-UTF8 * src/delete.c: Fix mangled window title in "Force Quit" dialog when using non-UTF8 locale. Close #462734. svn path=/trunk/; revision=3284 --- ChangeLog | 5 +++++ src/delete.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9f4bcabf7..e17cdeb29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-08-03 Frederic Crozat + + * src/delete.c: Fix mangled window title in "Force Quit" + dialog when using non-UTF8 locale. Close #462734. + 2007-08-02 Thomas Thurman Move "close" to bottom of window menu; allow workspace list to appear diff --git a/src/delete.c b/src/delete.c index 30941aee8..9d5c8e42b 100644 --- a/src/delete.c +++ b/src/delete.c @@ -306,6 +306,7 @@ delete_ping_timeout_func (MetaDisplay *display, char numbuf[32]; char timestampbuf[32]; char *window_id_str; + char *window_title; GIOChannel *channel; meta_topic (META_DEBUG_PING, @@ -319,6 +320,7 @@ delete_ping_timeout_func (MetaDisplay *display, } window_id_str = g_strdup_printf ("0x%lx", window->xwindow); + window_title = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL); sprintf (numbuf, "%d", window->screen->number); sprintf (timestampbuf, "%u", timestamp); @@ -329,7 +331,7 @@ delete_ping_timeout_func (MetaDisplay *display, argv[3] = "--timestamp"; argv[4] = timestampbuf; argv[5] = "--kill-window-question"; - argv[6] = window->title; + argv[6] = window_title; argv[7] = window_id_str; argv[8] = NULL; @@ -362,6 +364,7 @@ delete_ping_timeout_func (MetaDisplay *display, g_io_channel_unref (channel); out: + g_free (window_title); g_free (window_id_str); }