aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Vaynerman <pv@etersoft.ru>2018-07-26 02:51:00 +0300
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-08-22 15:20:48 +0200
commit9a7c0b081fad98bfcfcceff9557781f4b39ec572 (patch)
tree9a474df7664e0322e8a0642abeeaa57385e4967a
parent643e13bf3de6704f634d60342b738e0002f057b9 (diff)
downloadnx-libs-9a7c0b081fad98bfcfcceff9557781f4b39ec572.tar.gz
nx-libs-9a7c0b081fad98bfcfcceff9557781f4b39ec572.tar.bz2
nx-libs-9a7c0b081fad98bfcfcceff9557781f4b39ec572.zip
nxagent: Used 'Xutf8SetVMPropertis' instead of 'XSetStandardProperties' + 'Xutf8SetWMProperties'
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c19
1 files 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 26d46b5cc..b7a8f5404 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);