aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R Garbe <garbeam@gmail.com>2008-08-29 10:09:40 +0100
committerAnselm R Garbe <garbeam@gmail.com>2008-08-29 10:09:40 +0100
commitef00902fd91dba280aba605b1a812c2f0cdc3657 (patch)
tree845220e5a9d8342287ebc31d015a229e54ceaa6c
parent3e60c5d836c1f9f3b4415782de48476663943274 (diff)
simplified initfont
-rw-r--r--dmenu.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/dmenu.c b/dmenu.c
index 18f2a56..c0addad 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -79,7 +79,7 @@ static unsigned int mw, mh;
79static unsigned int numlockmask = 0; 79static unsigned int numlockmask = 0;
80static Bool running = True; 80static Bool running = True;
81static Display *dpy; 81static Display *dpy;
82static DC dc = {0}; 82static DC dc;
83static Item *allitems = NULL; /* first of all items */ 83static Item *allitems = NULL; /* first of all items */
84static Item *item = NULL; /* first of pattern matching items */ 84static Item *item = NULL; /* first of pattern matching items */
85static Item *sel = NULL; 85static Item *sel = NULL;
@@ -300,9 +300,6 @@ initfont(const char *fontstr) {
300 } 300 }
301 } 301 }
302 else { 302 else {
303 if(dc.font.xfont)
304 XFreeFont(dpy, dc.font.xfont);
305 dc.font.xfont = NULL;
306 if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)) 303 if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
307 && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) 304 && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
308 eprint("error, cannot load font: '%s'\n", fontstr); 305 eprint("error, cannot load font: '%s'\n", fontstr);