diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2018-10-08 22:40:33 +0000 |
|---|---|---|
| committer | Marco Trevisan <mail@3v1n0.net> | 2019-01-24 00:00:33 +0000 |
| commit | 6603925f7256f09db5a5adef3aba89e3f5a6b816 (patch) | |
| tree | ee5ecd0aa1cf90dd3e825002eeb6a5939f860aff | |
| parent | fe4c3aa6b5428acdd903017d6ad19f7aeadb964b (diff) | |
| download | mutter-6603925f7256f09db5a5adef3aba89e3f5a6b816.tar.gz | |
x11/window-props: Do not convert WM_NAME
The WM_NAME property is of type TEXT_PROPERTY, which is supposed to be
returned as UTF-8. Commit 840378ae68 broke that assumption, resulting
in crashes with non-UTF8 locales; however the "fix" of converting from
LATIN1 to UTF8 is wrong as well, as the conversion will spit out garbage
when the input encoding isn't actually LATIN1.
Now that the original issue in text_property_to_utf8() has been fixed,
we can simply revert the relevant bits of commit d62491f46eba748e.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/227
(cherry picked from commit 62775d191372da864e00797ef4d64cb22f18ccd8)
| -rw-r--r-- | src/x11/window-props.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/x11/window-props.c b/src/x11/window-props.c index 2f4dfeb31..7c6b25fdb 100644 --- a/src/x11/window-props.c +++ b/src/x11/window-props.c @@ -645,10 +645,7 @@ reload_wm_name (MetaWindow *window, if (value->type != META_PROP_VALUE_INVALID) { - g_autofree gchar *title = g_convert (value->v.str, -1, - "UTF-8", "LATIN1", - NULL, NULL, NULL); - set_window_title (window, title); + set_window_title (window, value->v.str); meta_verbose ("Using WM_NAME for new title of %s: \"%s\"\n", window->desc, window->title); |