frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: pass a valid ClientPtr to SetFontPath in all cases.

This commit is contained in:
Eamon Walsh 2007-10-10 17:40:22 -04:00 committed by Eamon Walsh
parent 59cebcd2e9
commit 7e9e01a4a3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/main.c
View File

@ -388,9 +388,9 @@ main(int argc, char *argv[], char *envp[])
FatalError("failed to initialize core devices"); FatalError("failed to initialize core devices");
InitFonts(); InitFonts();
if (loadableFonts) { if (loadableFonts)
SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error); SetFontPath(serverClient, 0, (unsigned char *)defaultFontPath,
} &error);
else { else {
if (SetDefaultFontPath(defaultFontPath) != Success) if (SetDefaultFontPath(defaultFontPath) != Success)
ErrorF("failed to set default font path '%s'", ErrorF("failed to set default font path '%s'",

3
hw/dmx/dmxfont.c
View File

@ -361,7 +361,8 @@ Bool dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont)
} }
} }
if (SetFontPath(NULL, newnpaths, (unsigned char *)newfp, &error)) { if (SetFontPath(serverClient, newnpaths, (unsigned char *)newfp,
&error)) {
/* Note that this should never happen since all of the /* Note that this should never happen since all of the
* FPEs were previously valid. */ * FPEs were previously valid. */
dmxLog(dmxError, "Cannot reset the default font path.\n"); dmxLog(dmxError, "Cannot reset the default font path.\n");