remove the ob_root var, its redundant of what Xlib already provides

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index 2fce1dd44a15afb21a09e5a05b60c3f032ee70b9..d2a4acaeed31e0b8177d4903489d136a3b913581 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -2,9 +2,7 @@
 #include "color.h"
 #include "mask.h"
 #include "theme.h"
-#include "kernel/geom.h"
-#include "kernel/gettext.h"
-#define _(str) gettext(str)
+#include "gettext.h"
 
 #include <X11/Xft/Xft.h>
 #include <glib.h>
@@ -57,7 +55,6 @@ static RrFont *openfont(const RrInstance *inst, char *fontstring)
         return NULL;
 
     match = XftFontMatch(RrDisplay(inst), RrScreen(inst), pat, &res);
-    FcPatternDestroy(pat);
     if (!match)
         return NULL;
 
@@ -66,7 +63,6 @@ static RrFont *openfont(const RrInstance *inst, char *fontstring)
 
     if (FcPatternGetBool(match, OB_SHADOW, 0, &out->shadow) != FcResultMatch)
         out->shadow = FALSE;
-    g_message("shadow %d", out->shadow);
 
     if (FcPatternGetInteger(match, OB_SHADOW_OFFSET, 0, &out->offset) !=
         FcResultMatch)
@@ -79,8 +75,8 @@ static RrFont *openfont(const RrInstance *inst, char *fontstring)
     out->tint = tint;
 
     font = XftFontOpenPattern(RrDisplay(inst), match);
-    FcPatternDestroy(match);
     if (!font) {
+        FcPatternDestroy(match);
         g_free(out);
         return NULL;
     } else
@@ -150,7 +146,7 @@ int RrFontMaxCharWidth(const RrFont *f)
     return (signed) f->xftfont->max_advance_width;
 }
 
-void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *area)
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
 {
     gint x,y,w,h;
     XftColor c;