From: Dana Jansens Date: Wed, 25 Apr 2007 01:59:56 +0000 (+0000) Subject: "text" was no longer needed X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=092780455989da14b1a3a8c1624a0fd8bf5cdfdd;p=chaz%2Fopenbox "text" was no longer needed --- diff --git a/render/font.c b/render/font.c index a0e622d5..bd4dcfc2 100644 --- a/render/font.c +++ b/render/font.c @@ -175,7 +175,6 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) XftColor c; gint mw; PangoRectangle rect; - gchar *text; PangoAttrList* attrs = NULL; /* center the text vertically @@ -192,13 +191,11 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) /* * * set up the layout * * */ - text = g_strdup(t->string); - if (t->shortcut) { gchar *i; gchar *lowertext; - lowertext = g_utf8_strdown(text, -1); + lowertext = g_utf8_strdown(t->string, -1); i = g_utf8_strchr(lowertext, -1, t->shortcut); if (i != NULL) { PangoAttribute *a; @@ -214,11 +211,9 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) g_free(lowertext); } - pango_layout_set_text(t->font->layout, text, -1); + pango_layout_set_text(t->font->layout, t->string, -1); pango_layout_set_width(t->font->layout, w * PANGO_SCALE); - g_free(text); - /* * * end of setting up the layout * * */ pango_layout_get_pixel_extents(t->font->layout, NULL, &rect);