Merge branch 'master' into chaz

[chaz/openbox] / obrender / font.c

diff --git a/obrender/font.c b/obrender/font.c
index cde0d0309bf92a01f6d3c45255df8a427f03360d..a22e23f50b1d9f19be1dfe2a32c14f4dd738aaec 100644 (file)
--- a/obrender/font.c
+++ b/obrender/font.c
@@ -68,7 +68,7 @@ RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size,
     PangoStyle pstyle;
     PangoAttrList *attrlist;
 
-    out = g_new(RrFont, 1);
+    out = g_slice_new(RrFont);
     out->inst = inst;
     out->ref = 1;
     out->font_desc = pango_font_description_new();
@@ -133,7 +133,7 @@ void RrFontClose(RrFont *f)
         if (--f->ref < 1) {
             g_object_unref(f->layout);
             pango_font_description_free(f->font_desc);
-            g_free(f);
+            g_slice_free(RrFont, f);
         }
     }
 }
@@ -181,7 +181,7 @@ RrSize *RrFontMeasureString(const RrFont *f, const gchar *str,
 
     g_assert(!flow || maxwidth > 0);
 
-    size = g_new(RrSize, 1);
+    size = g_slice_new(RrSize);
     font_measure_full(f, str, &size->width, &size->height, shadow_x, shadow_y,
                       flow, maxwidth);
     return size;
@@ -284,6 +284,8 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     case RR_JUSTIFY_CENTER:
         x += (w - mw) / 2;
         break;
+    case RR_JUSTIFY_NUM_TYPES:
+        g_assert_not_reached();
     }
 
     if (t->shadow_offset_x || t->shadow_offset_y) {