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

Revert "Characters of window title bar garbled"

Browse Source 
For some reason Gitlab pushed the wrong commits when merging
https://gitlab.gnome.org/GNOME/mutter/merge_requests/227. Correct that.

This reverts commit d387aa428a18393938c6d6f7baef2c1dd726436e.
This commit is contained in:
Jonas Ådahl 2018-10-12 15:00:02 +02:00
parent d387aa428a
commit e24947a460
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/x11/window-props.c
View File

@ -651,7 +651,10 @@ reload_wm_name (MetaWindow *window,
if (value->type != META_PROP_VALUE_INVALID) if (value->type != META_PROP_VALUE_INVALID)
{ {
set_window_title (window, value->v.str); g_autofree gchar *title = g_convert (value->v.str, -1,
"UTF-8", "LATIN1",
NULL, NULL, NULL);
set_window_title (window, title);
meta_verbose ("Using WM_NAME for new title of %s: \"%s\"\n", meta_verbose ("Using WM_NAME for new title of %s: \"%s\"\n",
window->desc, window->title); window->desc, window->title);

4
src/x11/xprops.c
View File

@ -639,7 +639,6 @@ text_property_to_utf8 (Display *xdisplay,
{ {
char *ret = NULL; char *ret = NULL;
char **local_list = NULL; char **local_list = NULL;
const char *charset = NULL;
int count = 0; int count = 0;
int res; int res;
@ -650,10 +649,7 @@ text_property_to_utf8 (Display *xdisplay,
if (count == 0) if (count == 0)
goto out; goto out;
if (g_get_charset (&charset))
ret = g_strdup (local_list[0]); ret = g_strdup (local_list[0]);
else
ret = g_convert (local_list[0], -1, "UTF-8", charset, NULL, NULL, NULL);
out: out:
XFreeStringList (local_list); XFreeStringList (local_list);