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

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,
+
+    Xutf8SetWMProperties(nxagentDisplay, 
                          nxagentDefaultWindows[pScreen->myNum],
                          nxagentWindowName, 
                          nxagentWindowName,
-                           nxagentIconPixmap,
-                           argv, argc, sizeHints);
+                         argv , argc , &sizeHints, &wmHints, NULL);
 
     if (sizeHints)
       XFree(sizeHints);