Skip to content

N
nx-libs
Unverified Commit aaae5d57 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'Etersoft-fix-nxagent-window-title-encoding' into 3.6.x

Attributes GH PR #705: https://github.com/ArcticaProject/nx-libs/pull/705
parents 489c1731 9a7c0b08
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @ aaae5d57
...@@ -441,8 +441,8 @@ Window nxagentCreateIconWindow(void) ...@@ -441,8 +441,8 @@ Window nxagentCreateIconWindow(void)
} }
} }
XSetWMProperties(nxagentDisplay, w, Xutf8SetWMProperties(nxagentDisplay, w,
&windowName, &windowName, window_name, window_name,
NULL , 0 , sizeHints, wmHints, NULL); NULL , 0 , sizeHints, wmHints, NULL);
if (sizeHints) if (sizeHints)
...@@ -1902,13 +1902,12 @@ N/A ...@@ -1902,13 +1902,12 @@ N/A
if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue) if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue)
sizeHints->flags |= USSize; sizeHints->flags |= USSize;
} }
/* FIXME: deprecated, replaced by XSetWmProperties() */
XSetStandardProperties(nxagentDisplay, Xutf8SetWMProperties(nxagentDisplay,
nxagentDefaultWindows[pScreen->myNum], nxagentDefaultWindows[pScreen->myNum],
nxagentWindowName, nxagentWindowName,
nxagentWindowName, nxagentWindowName,
nxagentIconPixmap, argv , argc , &sizeHints, &wmHints, NULL);
argv, argc, sizeHints);
if (sizeHints) if (sizeHints)
XFree(sizeHints); XFree(sizeHints);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment