Simplify default font path setup.

2 files changed, 2 insertions, 8 deletions

diff --git a/dix/globals.c b/dix/globals.c
index 3f12916e0..2eca277bd 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -139,7 +139,6 @@ char *defaultCursorFont = COMPILEDCURSORFONT;
 char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
 FontPtr defaultFont;   /* not declared in dix.h to avoid including font.h in
 			every compilation of dix code */
-Bool loadableFonts = FALSE;
 CursorPtr rootCursor;
 Bool blackRoot=FALSE;
 Bool whiteRoot=FALSE;
diff --git a/dix/main.c b/dix/main.c
index 855050950..2e12b709f 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -364,13 +364,8 @@ int main(int argc, char *argv[], char *envp[])
 	    FatalError("failed to initialize core devices");
 
 	InitFonts();
-	if (loadableFonts)
-	    SetFontPath(serverClient, 0, (unsigned char *)defaultFontPath,
-			&error);
-        else {
-	    if (SetDefaultFontPath(defaultFontPath) != Success)
-		ErrorF("failed to set default font path '%s'",
-			defaultFontPath);
+	if (SetDefaultFontPath(defaultFontPath) != Success) {
+	    ErrorF("failed to set default font path '%s'", defaultFontPath);
 	}
 	if (!SetDefaultFont(defaultTextFont)) {
 	    FatalError("could not open default font '%s'", defaultTextFont);