kill the const, use g_new instead of malloc, g_free the font in font_close()

diff --git a/render/font.c b/render/font.c
index 157b0c7e7c4317d5f10e1edd2834e9dba3dc964d..4e38de243cf883a282e7014ab674e6cb2fe6fc1e 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -1,11 +1,12 @@
-#include <stdlib.h>
-#include <X11/Xft/Xft.h>
 #include "../kernel/openbox.h"
 #include "font.h"
 
 #include "../src/gettext.h"
 #define _(str) gettext(str)
 
+#include <X11/Xft/Xft.h>
+#include <glib.h>
+
 void font_startup(void)
 {
 #ifdef DEBUG
@@ -44,7 +45,7 @@ ObFont *font_open(char *fontstring)
     XftFont *xf;
     
     if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
-        out = malloc(sizeof(ObFont));
+        out = g_new(ObFont, 1);
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -53,7 +54,7 @@ ObFont *font_open(char *fontstring)
     g_warning(_("Trying fallback font: %s\n"), "fixed");
 
     if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
-        out = malloc(sizeof(ObFont));
+        out = g_new(ObFont, 1);
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -67,9 +68,10 @@ ObFont *font_open(char *fontstring)
 void font_close(ObFont *f)
 {
     XftFontClose(ob_display, f->xftfont);
+    g_free(f);
 }
 
-int font_measure_string(ObFont *f, const char *str, int shadow, int offset)
+int font_measure_string(ObFont *f, char *str, int shadow, int offset)
 {
     XGlyphInfo info;