make the Unfocus action do something when config_focus_follow is set

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index f46bb660cdb2b7aded0da3be6c9589dda71598dc..b715bb80b076e4da150dbde4e4f99c3957b02ada 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -129,8 +129,7 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring)
 
     if (FcPatternGetInteger(match, "pixelsize", 0, &tmp_int) !=
             FcResultTypeMismatch) {
-        /* TODO: is PANGO_SCALE correct ?? */
-        pango_font_description_set_size(out->pango_font_description,
+        pango_font_description_set_absolute_size(out->pango_font_description,
                                         tmp_int*PANGO_SCALE);
     }
 
@@ -204,12 +203,12 @@ RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring)
 void RrFontClose(RrFont *f)
 {
     if (f) {
+#ifdef USE_PANGO
+        pango_font_description_free(f->pango_font_description);
+#endif
         XftFontClose(RrDisplay(f->inst), f->xftfont);
         g_free(f);
     }
-#ifdef USE_PANGO
-    pango_font_description_free(f->pango_font_description);
-#endif
 }
 
 static void font_measure_full(const RrFont *f, const gchar *str,