[X2Go-Commits] [nx-libs] 02/108: fix window title encoding (use utf8) for nxagent

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 643e13bf3de6704f634d60342b738e0002f057b9
Author: Pavel Vaynerman <pv at etersoft.ru>
Date:   Sat Jun 9 14:11:34 2018 +0300

    fix window title encoding (use utf8) for nxagent
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 6eae711..26d46b5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -441,8 +441,8 @@ Window nxagentCreateIconWindow(void)
     }
   }
 
-  XSetWMProperties(nxagentDisplay, w,
-                      &windowName, &windowName,
+  Xutf8SetWMProperties(nxagentDisplay, w,
+                      window_name, window_name,
                           NULL , 0 , sizeHints, wmHints, NULL);
 
   if (sizeHints)
@@ -867,6 +867,9 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
 
   int defaultVisualIndex = 0;
 
+  XTextProperty  xtpWmName;
+  char* wmName = nxagentWindowName;
+
   #ifdef TEST
   fprintf(stderr, "nxagentOpenScreen: Called for screen index [%d].\n",
               pScreen->myNum);
@@ -1910,6 +1913,9 @@ N/A
                            nxagentIconPixmap,
                            argv, argc, sizeHints);
 
+    if (Xutf8TextListToTextProperty(nxagentDisplay, &wmName, 1, XCompoundTextStyle, &xtpWmName) >= Success)
+       XSetWMName(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &xtpWmName);
+
     if (sizeHints)
       XFree(sizeHints);
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git