aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2017-02-16 08:21:56 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-10 16:03:10 +0200
commit4768662b03067afbc122683d234205716ba3606e (patch)
tree5c8121ae35635fbe2230d03737150a4c72b223ca /nx-X11
parent523009b96bd2e479c9823267bc060f8e5b0516e8 (diff)
downloadnx-libs-4768662b03067afbc122683d234205716ba3606e.tar.gz
nx-libs-4768662b03067afbc122683d234205716ba3606e.tar.bz2
nx-libs-4768662b03067afbc122683d234205716ba3606e.zip
dix: pass a valid ClientPtr to SetFontPath in all cases.
Backported from X.org: commit 7e9e01a4a34fa45521067d43c5bbff942dd5d51a Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Oct 10 17:40:22 2007 -0400 dix: pass a valid ClientPtr to SetFontPath in all cases. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/dix/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c
index 86d495466..745ca14e8 100644
--- a/nx-X11/programs/Xserver/dix/main.c
+++ b/nx-X11/programs/Xserver/dix/main.c
@@ -295,7 +295,7 @@ main(int argc, char *argv[], char *envp[])
ReserveClientIds(serverClient);
if (loadableFonts) {
- SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error);
+ SetFontPath(serverClient, 0, (unsigned char *)defaultFontPath, &error);
} else {
if (SetDefaultFontPath(defaultFontPath) != Success)
ErrorF("failed to set default font path '%s'\n",