diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-05-14 16:02:05 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-05-14 16:02:05 -0400 |
| commit | 166177e36bfc7bd1df03663ad89500cff056d563 (patch) | |
| tree | d0de802558c0358bffd5d684eb3205f0fc977f38 | |
| parent | 2efe1abb6fc786a4f86464978ae0d23fc7347a98 (diff) | |
Simplify default font path setup.
| -rw-r--r-- | dix/globals.c | 1 | ||||
| -rw-r--r-- | dix/main.c | 9 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 3 | ||||
| -rw-r--r-- | include/globals.h | 1 |
4 files changed, 2 insertions, 12 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); diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 851f4dc49..4e1f6d6b3 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1184,9 +1184,6 @@ OsVendorInit() signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */ #endif OsDelayInitColors = TRUE; -#ifndef BUILTIN_FONTS - loadableFonts = TRUE; -#endif if (!beenHere) xf86LogInit(); diff --git a/include/globals.h b/include/globals.h index 9e5060d5f..6cceb0184 100644 --- a/include/globals.h +++ b/include/globals.h @@ -17,7 +17,6 @@ extern Bool screenSaverSuspended; extern char *defaultFontPath; extern int monitorResolution; -extern Bool loadableFonts; extern int defaultColorVisualClass; extern Bool Must_have_memory; |