[X2Go-Commits] [nx-libs] 03/108: nxagent: Used 'Xutf8SetVMPropertis' instead of 'XSetStandardProperties' + 'Xutf8SetWMProperties'

git-admin at x2go.org git-admin at x2go.org
Fri Nov 9 20:35:28 CET 2018


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

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

commit 9a7c0b081fad98bfcfcceff9557781f4b39ec572
Author: Pavel Vaynerman <pv at etersoft.ru>
Date:   Thu Jul 26 02:51:00 2018 +0300

    nxagent: Used 'Xutf8SetVMPropertis' instead of 'XSetStandardProperties' + 'Xutf8SetWMProperties'
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 26d46b5..b7a8f54 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -867,9 +867,6 @@ 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);
@@ -1905,16 +1902,12 @@ N/A
       if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue)
         sizeHints->flags |= USSize;
     }
-    /* FIXME: deprecated, replaced by XSetWmProperties() */
-    XSetStandardProperties(nxagentDisplay,
-                           nxagentDefaultWindows[pScreen->myNum],
-                           nxagentWindowName,
-                           nxagentWindowName,
-                           nxagentIconPixmap,
-                           argv, argc, sizeHints);
-
-    if (Xutf8TextListToTextProperty(nxagentDisplay, &wmName, 1, XCompoundTextStyle, &xtpWmName) >= Success)
-       XSetWMName(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &xtpWmName);
+
+    Xutf8SetWMProperties(nxagentDisplay, 
+                         nxagentDefaultWindows[pScreen->myNum],
+                         nxagentWindowName, 
+                         nxagentWindowName,
+                         argv , argc , &sizeHints, &wmHints, NULL);
 
     if (sizeHints)
       XFree(sizeHints);

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


More information about the x2go-commits mailing list