replace hand rolled font_make() with XftFontOpenName() and merge into

font_init().

1 files changed, 2 insertions, 3 deletions

diff --git a/conf.c b/conf.c
index 95e0484..9d9fc77 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: conf.c,v 1.109 2012/11/14 21:31:53 okan Exp $
+ * $OpenBSD: conf.c,v 1.110 2012/11/28 14:14:44 okan Exp $
  */
 
 #include <sys/param.h>
@@ -62,8 +62,7 @@ conf_gap(struct conf *c, struct screen_ctx *sc)
 void
 conf_font(struct conf *c, struct screen_ctx *sc)
 {
-	font_init(sc, c->color[CWM_COLOR_FONT].name);
-	sc->font = font_make(sc, c->font);
+	font_init(sc, c->font, c->color[CWM_COLOR_FONT].name);
 }
 
 static struct color color_binds[] = {