From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz

[xscreensaver] / hacks / xsublim.c

diff --git a/hacks/xsublim.c b/hacks/xsublim.c
index 60d4ce69abbaf9b0fa4250bb3783bc023e99d6a0..719de50c8bb7641e60bb075d2b08941370ac633f 100644 (file)
--- a/hacks/xsublim.c
+++ b/hacks/xsublim.c
@@ -107,6 +107,7 @@
 #include "usleep.h"
 #include "yarandom.h"
 #include "resources.h"
+#include "font-retry.h"
 #include "vroot.h"
 
 
@@ -313,12 +314,10 @@ int main(int argc,char* argv[])
                "-*-character-*-r-*-*-*-600-*-*-p-*-*-*",
                "-*-helvetica-*-r-*-*-*-600-*-*-p-*-*-*",
                "-*-lucida-*-r-*-*-*-600-*-*-p-*-*-*",
-               "-*-times-*-r-*-*-*-600-*-*-p-*-*-*",
                "-*-*-*-r-*-sans-*-600-*-*-p-*-*-*",
                "-*-*-*-r-*-*-*-600-*-*-m-*-*-*",
                "-*-helvetica-*-r-*-*-*-240-*-*-p-*-*-*",
                "-*-lucida-*-r-*-*-*-240-*-*-p-*-*-*",
-               "-*-times-*-r-*-*-*-240-*-*-p-*-*-*",
                "-*-*-*-r-*-sans-*-240-*-*-p-*-*-*",
                "-*-*-*-r-*-*-*-240-*-*-m-*-*-*",
                "fixed",
@@ -557,12 +556,12 @@ int main(int argc,char* argv[])
        }
 
        /* Load the font */
-       font_Font = XLoadQueryFont(dpy,
+       font_Font = load_font_retry(dpy,
         get_string_resource(dpy, XSUBLIM_ARG_FONT,"Font"));
        font_Index = 0;
        while ((font_Font == NULL) && (font_List[font_Index] != NULL))
        {
-               font_Font = XLoadQueryFont(dpy,font_List[font_Index]);
+               font_Font = load_font_retry(dpy,font_List[font_Index]);
                font_Index++;
        }
        if (font_Font == NULL)