From cb1be843d7f492f20ac586c8807efb9f6b232c23 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 6 Jan 2000 05:58:15 +0000 Subject: [PATCH] allow full paths for font names too.. SVN revision: 1862 --- src/font.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/font.c b/src/font.c index df8ed4d..1004b79 100644 --- a/src/font.c +++ b/src/font.c @@ -176,19 +176,25 @@ __imlib_load_font(char *fontname) free(name); return NULL; } - sprintf(tmp, "%s/%s.ttf", fpath[j], name); + sprintf(tmp, "%s.ttf", name); if (__imlib_FileIsFile(tmp)) file = strdup(tmp); else { - sprintf(tmp, "%s/%s.TTF", fpath[j], name); + sprintf(tmp, "%s/%s.ttf", fpath[j], name); if (__imlib_FileIsFile(tmp)) file = strdup(tmp); else { - sprintf(tmp, "%s/%s", fpath[j], name); + sprintf(tmp, "%s/%s.TTF", fpath[j], name); if (__imlib_FileIsFile(tmp)) file = strdup(tmp); + else + { + sprintf(tmp, "%s/%s", fpath[j], name); + if (__imlib_FileIsFile(tmp)) + file = strdup(tmp); + } } } free(tmp);