Store WM_NAME and WM_ICON_NAME in COMPOUND_TEXT format.

diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c
index ea0548f..eb26959 100644
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -796,6 +796,7 @@
     char *utf8_buffer;
     static UINT text_cp = (UINT)-1;
     Window win;
+    XTextProperty prop;
 
     if ((win = X11DRV_get_whole_window( hwnd )))
     {
@@ -833,8 +834,12 @@
         WideCharToMultiByte(CP_UTF8, 0, text, strlenW(text), utf8_buffer, count, NULL, NULL);
 
         wine_tsx11_lock();
-        XStoreName( display, win, buffer );
-        XSetIconName( display, win, buffer );
+	if (XmbTextListToTextProperty( display, &buffer, 1, XStdICCTextStyle, &prop ) == Success)
+	{
+	    XSetWMName( display, win, &prop );
+	    XSetWMIconName( display, win, &prop );
+	    XFree( prop.value );
+	}
         /*
         Implements a NET_WM UTF-8 title. It should be without a trailing \0,
         according to the standard