ALT Linux repos
Group :: Graphical desktop/Other
RPM: ctwm
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: ctwm-3.8.2-GetFont.patch
Download
Download
diff --git a/util.c b/util.c
index 4aaec07..56578ca 100644
--- a/util.c
+++ b/util.c
@@ -1514,16 +1514,12 @@ void GetFont(MyFont *font)
int ascent;
int descent;
int fnum;
- char *basename2;
if (font->font_set != NULL){
XFreeFontSet(dpy, font->font_set);
}
- basename2 = (char *)malloc(strlen(font->basename) + 3);
- if (basename2) sprintf(basename2, "%s,*", font->basename);
- else basename2 = font->basename;
- if( (font->font_set = XCreateFontSet(dpy, basename2,
+ if( (font->font_set = XCreateFontSet(dpy, font->basename,
&missing_charset_list_return,
&missing_charset_count_return,
&def_string_return)) == NULL) {
@@ -1540,7 +1536,6 @@ void GetFont(MyFont *font)
exit(1);
}
}
- if (basename2 != font->basename) free(basename2);
font_extents = XExtentsOfFontSet(font->font_set);
fnum = XFontsOfFontSet(font->font_set, &xfonts, &font_names);