diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-05 19:54:40 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-27 12:07:04 +0100 |
| commit | 66d9b3e8b2c3520627d3c850c0cc93b57f855cdd (patch) | |
| tree | abf4b6b943bb4b392e22e91018a371190f06c3bc | |
| parent | 55854645c9ba4ca755adb07299b5f78d87027ba1 (diff) | |
| download | nx-libs-66d9b3e8b2c3520627d3c850c0cc93b57f855cdd.tar.gz nx-libs-66d9b3e8b2c3520627d3c850c0cc93b57f855cdd.tar.bz2 nx-libs-66d9b3e8b2c3520627d3c850c0cc93b57f855cdd.zip | |
Xserver/hw/nxagent/Font.c: Drop NXAGENT_ALTERNATE_FONT_PATH_4 (pointing to /usr/NX/share/fonts/base) entirely.
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Font.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 5b9c31106..1213443c9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -73,7 +73,6 @@ is" without express or implied warranty. #define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/X11/fonts" #define NXAGENT_ALTERNATE_FONT_DIR_2 "/usr/share/fonts/X11" #define NXAGENT_ALTERNATE_FONT_DIR_3 "/usr/share/fonts" -#define NXAGENT_ALTERNATE_FONT_DIR_4 "/usr/NX/share/fonts" #define NXAGENT_DEFAULT_FONT_PATH \ "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ @@ -99,9 +98,6 @@ is" without express or implied warranty. /usr/share/fonts/100dpi/,/usr/share/fonts/TTF/,\ /usr/NX/share/fonts/base" -#define NXAGENT_ALTERNATE_FONT_PATH_4 \ -"/usr/NX/share/fonts/base" - #undef NXAGENT_FONTCACHE_DEBUG #undef NXAGENT_RECONNECT_FONT_DEBUG #undef NXAGENT_FONTMATCH_DEBUG @@ -1574,32 +1570,6 @@ void nxagentVerifyDefaultFontPath(void) strcat(fontPath, NXAGENT_ALTERNATE_FONT_PATH_3); } - - if (stat(NXAGENT_ALTERNATE_FONT_DIR_4, &dirStat) == 0 && - S_ISDIR(dirStat.st_mode) != 0) - { - /* - * Let's use the "/usr/NX/share/fonts" path. - */ - - #ifdef TEST - fprintf(stderr, "nxagentVerifyDefaultFontPath: Assuming fonts in directory [%s].\n", - validateString(NXAGENT_ALTERNATE_FONT_DIR_4)); - #endif - - if (*fontPath != '\0') - { - fontPath = realloc(fontPath, strlen(fontPath) + strlen(NXAGENT_ALTERNATE_FONT_PATH_4) + 2); - strcat(fontPath, ","); - } - else - { - fontPath = realloc(fontPath, strlen(fontPath) + strlen(NXAGENT_ALTERNATE_FONT_PATH_4) + 1); - } - - strcat(fontPath, NXAGENT_ALTERNATE_FONT_PATH_4); - } - if (*fontPath == '\0') { #ifdef WARNING |