aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/GetHints.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/GetHints.c
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/GetHints.c')
-rw-r--r--libX11/src/GetHints.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libX11/src/GetHints.c b/libX11/src/GetHints.c
index e5ccbcf7b..f52a89222 100644
--- a/libX11/src/GetHints.c
+++ b/libX11/src/GetHints.c
@@ -29,13 +29,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 Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -99,7 +99,7 @@ Status XGetSizeHints (
return(1);
}
-/*
+/*
* must return a pointer to the hint, in malloc'd memory, or routine is not
* extensible; any use of the caller's memory would cause things to be stepped
* on.
@@ -115,7 +115,7 @@ XWMHints *XGetWMHints (
int actual_format;
unsigned long leftover;
unsigned long nitems;
- if (XGetWindowProperty(dpy, w, XA_WM_HINTS,
+ if (XGetWindowProperty(dpy, w, XA_WM_HINTS,
0L, (long)NumPropWMHintsElements,
False, XA_WM_HINTS, &actual_type, &actual_format,
&nitems, &leftover, (unsigned char **)&prop)
@@ -166,9 +166,9 @@ XGetNormalHints (
return (XGetSizeHints(dpy, w, hints, XA_WM_NORMAL_HINTS));
}
-
+
/*
- * XGetIconSizes reads the property
+ * XGetIconSizes reads the property
* ICONSIZE_ATOM type: ICONSIZE_ATOM format: 32
*/
@@ -205,7 +205,7 @@ Status XGetIconSizes (
/* static copies not allowed in library, due to reentrancy constraint*/
nitems /= NumPropIconSizeElements;
- if (! (hp = hints = (XIconSize *)
+ if (! (hp = hints = (XIconSize *)
Xcalloc ((unsigned) nitems, (unsigned) sizeof(XIconSize)))) {
if (prop) Xfree ((char *) prop);
return 0;
@@ -280,7 +280,7 @@ XGetTransientForHint(
unsigned long leftover;
Window *data = NULL;
if (XGetWindowProperty(dpy, w, XA_WM_TRANSIENT_FOR, 0L, 1L, False,
- XA_WINDOW,
+ XA_WINDOW,
&actual_type,
&actual_format, &nitems, &leftover, (unsigned char **) &data)
!= Success) {
@@ -312,11 +312,11 @@ XGetClassHint(
unsigned long leftover;
unsigned char *data = NULL;
if (XGetWindowProperty(dpy, w, XA_WM_CLASS, 0L, (long)BUFSIZ, False,
- XA_STRING,
+ XA_STRING,
&actual_type,
&actual_format, &nitems, &leftover, &data) != Success)
return (0);
-
+
if ( (actual_type == XA_STRING) && (actual_format == 8) ) {
len_name = strlen((char *) data);
if (! (classhint->res_name = Xmalloc((unsigned) (len_name+1)))) {