isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 21:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mangled window title in "Force Quit" dialog when using non-UTF8

Browse Source 
* src/delete.c: Fix mangled window title in "Force Quit"
        dialog when using non-UTF8 locale. Close #462734.


svn path=/trunk/; revision=3284
This commit is contained in:
Frédéric Crozat 2007-08-03 07:43:03 +00:00
parent 007e8c013c
commit 696ef85e64
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-08-03 Frederic Crozat <fcrozat@mandriva.com>
* src/delete.c: Fix mangled window title in "Force Quit"
dialog when using non-UTF8 locale. Close #462734.
2007-08-02 Thomas Thurman <thomas@thurman.org.uk> 2007-08-02 Thomas Thurman <thomas@thurman.org.uk>
Move "close" to bottom of window menu; allow workspace list to appear Move "close" to bottom of window menu; allow workspace list to appear

5
src/delete.c
View File

@ -306,6 +306,7 @@ delete_ping_timeout_func (MetaDisplay *display,
char numbuf[32]; char numbuf[32];
char timestampbuf[32]; char timestampbuf[32];
char *window_id_str; char *window_id_str;
char *window_title;
GIOChannel *channel; GIOChannel *channel;
meta_topic (META_DEBUG_PING, 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_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 (numbuf, "%d", window->screen->number);
sprintf (timestampbuf, "%u", timestamp); sprintf (timestampbuf, "%u", timestamp);
@ -329,7 +331,7 @@ delete_ping_timeout_func (MetaDisplay *display,
argv[3] = "--timestamp"; argv[3] = "--timestamp";
argv[4] = timestampbuf; argv[4] = timestampbuf;
argv[5] = "--kill-window-question"; argv[5] = "--kill-window-question";
argv[6] = window->title; argv[6] = window_title;
argv[7] = window_id_str; argv[7] = window_id_str;
argv[8] = NULL; argv[8] = NULL;
@ -362,6 +364,7 @@ delete_ping_timeout_func (MetaDisplay *display,
g_io_channel_unref (channel); g_io_channel_unref (channel);
out: out:
g_free (window_title);
g_free (window_id_str); g_free (window_id_str);
} }