diff options
| author | Jamey Sharp <jamey@minilop.net> | 2017-02-16 08:19:40 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 16:03:10 +0200 |
| commit | f743f9f743362c891f049a514cdcf3d39546194b (patch) | |
| tree | 3d6905c29185d6c183eba8766c09e459a1af8170 /nx-X11/programs/Xserver/include | |
| parent | 4768662b03067afbc122683d234205716ba3606e (diff) | |
| download | nx-libs-f743f9f743362c891f049a514cdcf3d39546194b.tar.gz nx-libs-f743f9f743362c891f049a514cdcf3d39546194b.tar.bz2 nx-libs-f743f9f743362c891f049a514cdcf3d39546194b.zip | |
SetFontPath: set client->errorValue on failure.
Backported from X.org:
commit 21ceae9002c6364deb3d074cf2da7d3864cf6879
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 11 10:24:00 2010 -0700
SetFontPath: set client->errorValue on failure.
Previously the callers were only setting errorValue on Success, when
it's ignored, and leaving it alone on failure, when it's sent to the
client.
Since SetFontPath takes the ClientPtr, let it set client->errorValue
instead of letting the callers continue to get it wrong.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/include')
| -rw-r--r-- | nx-X11/programs/Xserver/include/dixfont.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/include/dixfont.h b/nx-X11/programs/Xserver/include/dixfont.h index 6149d2160..004acefbf 100644 --- a/nx-X11/programs/Xserver/include/dixfont.h +++ b/nx-X11/programs/Xserver/include/dixfont.h @@ -100,8 +100,7 @@ extern int ImageText(ClientPtr /*client*/, extern int SetFontPath(ClientPtr /*client*/, int /*npaths*/, - unsigned char * /*paths*/, - int * /*error*/); + unsigned char * /*paths*/); extern int SetDefaultFontPath(char * /*path*/); |