aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-08-22 15:21:49 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-08-22 15:21:49 +0200
commitaaae5d574801b5952a4f5024366bddab8d0baa02 (patch)
tree9a474df7664e0322e8a0642abeeaa57385e4967a /nx-X11/programs
parent489c17313090b58b5a4f898a47f23d50372923f2 (diff)
parent9a7c0b081fad98bfcfcceff9557781f4b39ec572 (diff)
downloadnx-libs-aaae5d574801b5952a4f5024366bddab8d0baa02.tar.gz
nx-libs-aaae5d574801b5952a4f5024366bddab8d0baa02.tar.bz2
nx-libs-aaae5d574801b5952a4f5024366bddab8d0baa02.zip
Merge branch 'Etersoft-fix-nxagent-window-title-encoding' into 3.6.x
Attributes GH PR #705: https://github.com/ArcticaProject/nx-libs/pull/705
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 6eae711f5..b7a8f5404 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)
@@ -1902,13 +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);
+
+ Xutf8SetWMProperties(nxagentDisplay,
+ nxagentDefaultWindows[pScreen->myNum],
+ nxagentWindowName,
+ nxagentWindowName,
+ argv , argc , &sizeHints, &wmHints, NULL);
if (sizeHints)
XFree(sizeHints);