diff -urN ./nx-X11/programs/Xserver/hw/nxagent/Font.c ../src-f/nx-X11/programs/Xserver/hw/nxagent/Font.c --- ./nx-X11/programs/Xserver/hw/nxagent/Font.c 2009-09-22 19:47:04.000000000 +0400 +++ ../src-f/nx-X11/programs/Xserver/hw/nxagent/Font.c 2009-12-06 01:42:23.000000000 +0300 @@ -61,17 +61,17 @@ #undef TEST #undef DEBUG -#define NXAGENT_DEFAULT_FONT_DIR "/usr/X11R6/lib/X11/fonts" +#define NXAGENT_DEFAULT_FONT_DIR "/usr/share/fonts" #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_3 "/usr/X11R6/lib/X11/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/,\ -/usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\ -/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/,\ -/usr/NX/share/fonts/base" +"/usr/share/fonts/local/,/usr/share/fonts/TTF/,\ +/usr/share/fonts/Type1/,/usr/share/fonts/cyrillic/,\ +/usr/share/fonts/misc/,/usr/share/fonts/100dpi/,\ +/usr/share/fonts/75dpi/" #define NXAGENT_ALTERNATE_FONT_PATH \ "/usr/share/X11/fonts/misc/,/usr/share/X11/fonts/Speedo/,\ @@ -86,9 +86,9 @@ /usr/NX/share/fonts/base" #define NXAGENT_ALTERNATE_FONT_PATH_3 \ -"/usr/share/fonts/misc/,/usr/share/fonts/Speedo/,\ -/usr/share/fonts/Type1/,/usr/share/fonts/75dpi/,\ -/usr/share/fonts/100dpi/,/usr/share/fonts/TTF/,\ +"/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ +/usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\ +/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/,\ /usr/NX/share/fonts/base" #define NXAGENT_ALTERNATE_FONT_PATH_4 \