X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=356b9c6ebd757432c6d278e8406183241f23cce2;hb=d81c4be6001a711e9f0dea247f43d8de670bc27f;hp=a32bf7ce0a5ae995f3c3bcf567d22917d2c41289;hpb=b265acbd45dc5bcad1ebf1c11bb97821cfa4ad90;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index a32bf7ce..356b9c6e 100644
--- a/render/font.c
+++ b/render/font.c
@@ -244,7 +244,7 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     pango_layout_get_pixel_extents(t->font->layout, NULL, &rect);
     mw = rect.width;
 
-    /* pango_layout_set_alignment doesn't work with 
+    /* pango_layout_set_alignment doesn't work with
        pango_xft_render_layout_line */
     switch (t->justify) {
     case RR_JUSTIFY_LEFT:
@@ -278,11 +278,11 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     c.pixel = t->color->pixel;
 
     if (t->shortcut) {
-        const gchar *c = t->string + t->shortcut_pos;
+        const gchar *s = t->string + t->shortcut_pos;
 
         t->font->shortcut_underline->start_index = t->shortcut_pos;
         t->font->shortcut_underline->end_index = t->shortcut_pos +
-            (g_utf8_next_char(c) - c);
+            (g_utf8_next_char(s) - s);
 
         /* the attributes are owned by the layout.
            re-add the attributes to the layout after changing the