Blame SOURCES/brltty-4.5-xw-fonts-fix.patch

567c2d
diff --git a/Drivers/Braille/XWindow/braille.c b/Drivers/Braille/XWindow/braille.c
567c2d
index 26ca705..ccabdcd 100644
567c2d
--- a/Drivers/Braille/XWindow/braille.c
567c2d
+++ b/Drivers/Braille/XWindow/braille.c
567c2d
@@ -211,7 +211,7 @@ typedef enum {
567c2d
 static int cols,lines;
567c2d
 static int input;
567c2d
 static char *model = "simple";
567c2d
-static const char *fontname = "-*-clearlyu-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-unifont-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso8859-1";
567c2d
+static const char *fontname = "-*-clearlyu-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-r-*-*-*-*-*-*-*-*-iso10646-1,-*-unifont-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso8859-1";
567c2d
 static int xtArgc = 1;
567c2d
 static char *xtDefArgv[]= { "brltty", NULL };
567c2d
 static char **xtArgv = xtDefArgv;
567c2d
@@ -944,7 +944,6 @@ static int generateToplevel(void)
567c2d
 #ifdef USE_XAW
567c2d
 	XtNshowGrip,False,
567c2d
 	XtNinternational, True,
567c2d
-	XNFontSet, fontset,
567c2d
 #else /* USE_XAW */
567c2d
 	XmNpaneMaximum,20,
567c2d
 	XmNpaneMinimum,20,
567c2d
@@ -952,10 +951,11 @@ static int generateToplevel(void)
567c2d
 #endif /* USE_XAW */
567c2d
 #ifdef USE_XAW
567c2d
 	XtNlabel, disp,
567c2d
+	fontset ? XNFontSet : NULL, fontset, NULL
567c2d
 #else /* USE_XAW */
567c2d
-	XmNlabelString, display_cs,
567c2d
+	XmNlabelString, display_cs, NULL
567c2d
 #endif /* USE_XAW */
567c2d
-	NULL);
567c2d
+	);
567c2d
 
567c2d
 #ifdef USE_XAW
567c2d
       if (fontset) {