diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
| commit | cb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch) | |
| tree | 8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/WMProps.c | |
| parent | 213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff) | |
| parent | c87efef42f76c2ff0dcfad2842ab369beffd21de (diff) | |
| download | vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2 vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/WMProps.c')
| -rw-r--r-- | libX11/src/WMProps.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libX11/src/WMProps.c b/libX11/src/WMProps.c index a581f335c..26ffc3ba3 100644 --- a/libX11/src/WMProps.c +++ b/libX11/src/WMProps.c @@ -34,13 +34,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Wyse not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. WYSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -62,7 +62,7 @@ SOFTWARE. #include <X11/Xlocale.h> -/* +/* * XSetWMProperties sets the following properties: * WM_NAME type: TEXT format: varies? * WM_ICON_NAME type: TEXT format: varies? @@ -73,7 +73,7 @@ SOFTWARE. * WM_CLASS type: STRING/STRING format: 8 * WM_LOCALE_NAME type: STRING format: 8 */ - + void XSetWMProperties ( Display *dpy, Window w, /* window to decorate */ @@ -109,7 +109,7 @@ void XSetWMProperties ( textprop.format = 8; textprop.nitems = len; XSetWMClientMachine (dpy, w, &textprop); - + /* set hints about how geometry and window manager interaction */ if (sizeHints) XSetWMNormalHints (dpy, w, sizeHints); if (wmHints) XSetWMHints (dpy, w, wmHints); @@ -139,7 +139,7 @@ void XSetWMProperties ( } XSetClassHint (dpy, w, classHints); } - + locale = setlocale(LC_CTYPE, (char *)NULL); if (locale) XChangeProperty (dpy, w, XInternAtom(dpy, "WM_LOCALE_NAME", False), |