Added tag 1.6 for changeset dcc5427f99f51a978386a0dd770467cd911ac84b

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 74a47a6..bd11091 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -4,7 +4,6 @@
 #include "dmenu.h"
 #include <stdio.h>
 #include <string.h>
 #include "dmenu.h"
 #include <stdio.h>
 #include <string.h>

-#include <X11/Xlocale.h>

 
 /* static */
 
 
 /* static */
 


@@ -80,21 +79,15 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
 
 void
 setfont(const char *fontstr) {

-       char **missing, *def;
+       char *def, **missing;

        int i, n;
 
        missing = NULL;
        int i, n;
 
        missing = NULL;

-       setlocale(LC_ALL, "");

        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);

-       if(missing) {
+       if(missing)

                XFreeStringList(missing);
                XFreeStringList(missing);

-               if(dc.font.set) {
-                       XFreeFontSet(dpy, dc.font.set);
-                       dc.font.set = NULL;
-               }
-       }

        if(dc.font.set) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
        if(dc.font.set) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;