Browse Source

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.
John Watson 10 years ago
parent
commit
182c86de3f
1 changed files with 2 additions and 3 deletions
  1. 2 3
      platform/x11/os_x11.cpp

+ 2 - 3
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 */
 	/* set the name and class hints for the window manager to use */
 	classHint = XAllocClassHint();
 	classHint = XAllocClassHint();
 	if (classHint) {
 	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);
 	XSetClassHint(x11_display, x11_window, classHint);
 	XFree(classHint);
 	XFree(classHint);