aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/GetTxtProp.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
commit051d521f6e20761ba6831cecd91883da960fa931 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/GetTxtProp.c
parent6dce607bad8711dd06a5a7b69ad1930386b4123b (diff)
parentb8de7bf654929c823080b211aeac56cd213f5a32 (diff)
downloadnx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214 Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/GetTxtProp.c')
-rw-r--r--nx-X11/lib/X11/GetTxtProp.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/nx-X11/lib/X11/GetTxtProp.c b/nx-X11/lib/X11/GetTxtProp.c
index 1694107b8..2694b8184 100644
--- a/nx-X11/lib/X11/GetTxtProp.c
+++ b/nx-X11/lib/X11/GetTxtProp.c
@@ -3,13 +3,13 @@ Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.,
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 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
@@ -57,11 +57,11 @@ from The Open Group.
#include <nx-X11/Xos.h>
#include <stdio.h>
-Status XGetTextProperty (display, window, tp, property)
- Display *display;
- Window window;
- XTextProperty *tp;
- Atom property;
+Status XGetTextProperty (
+ Display *display,
+ Window window,
+ XTextProperty *tp,
+ Atom property)
{
Atom actual_type;
int actual_format = 0;
@@ -87,26 +87,26 @@ Status XGetTextProperty (display, window, tp, property)
return False;
}
-Status XGetWMName (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+Status XGetWMName (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
return (XGetTextProperty (dpy, w, tp, XA_WM_NAME));
}
-Status XGetWMIconName (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+Status XGetWMIconName (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
return (XGetTextProperty (dpy, w, tp, XA_WM_ICON_NAME));
}
-Status XGetWMClientMachine (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+Status XGetWMClientMachine (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
return (XGetTextProperty (dpy, w, tp, XA_WM_CLIENT_MACHINE));
}