From 182c86de3f9ca4bde72b61674e4b9e9757182be3 Mon Sep 17 00:00:00 2001 From: John Watson Date: Sun, 22 Mar 2015 14:05:24 -0700 Subject: [PATCH] Reverted change to classHint Using `char wmclass[] = "Godot"` causes `xprop` to report the following for WM_CLASS: `WM_CLASS(STRING) = "\200\326\322\365\377\177", "\200\326\322\365\377\177"` This makes the Unity window manager fail to connect the running app with the icon on the launcher. --- platform/x11/os_x11.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 8196281732a..e974fe5f9f2 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -299,9 +299,8 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi /* set the name and class hints for the window manager to use */ classHint = XAllocClassHint(); if (classHint) { - char wmclass[] = "Godot"; - classHint->res_name = wmclass; - classHint->res_class = wmclass; + classHint->res_name = "Godot"; + classHint->res_class = "Godot"; } XSetClassHint(x11_display, x11_window, classHint); XFree(classHint);