[xine-cvs] CVS: xine-ui/src/xitk/xine-toolkit font.c,1.10,1.11

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk/xine-toolkit
In directory sc8-pr-cvs1:/tmp/cvs-serv13342/src/xitk/xine-toolkit

Modified Files:
	font.c 
Log Message:
More verbose error message when loading fonts fails.


Index: font.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/font.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- font.c	18 Jul 2003 21:34:40 -0000	1.10
+++ font.c	2 Oct 2003 08:03:35 -0000	1.11
@@ -421,12 +421,12 @@
     xtfs = (xitk_font_t *) xitk_xmalloc(sizeof(xitk_font_t));
 
     if(!xitk_font_load_one(display, font, xtfs)) {
-      char *fname = xitk_get_default_font();
+      char *fdname = xitk_get_default_font();
 
-      if(!fname || !xitk_font_load_one(display, fname, xtfs)) {
-        fname = xitk_get_system_font();
- 	if(!xitk_font_load_one(display, fname, xtfs)) {
-           XITK_WARNING("%s(): XLoadQueryFont() failed\n", __FUNCTION__);
+      if(!fdname || !xitk_font_load_one(display, fdname, xtfs)) {
+        char *fsname = xitk_get_system_font();
+ 	if(!xitk_font_load_one(display, fsname, xtfs)) {
+           XITK_WARNING("loading font \"%s\" failed, default and system fonts \"%s\" and \"%s\" failed too\n", font, fdname, fsname);
            free(xtfs);
            pthread_mutex_unlock(&cache.mutex);
            return NULL;