diff --git a/bar.c b/bar.c index 7d588df..b61ddda 100644 --- a/bar.c +++ b/bar.c @@ -518,7 +518,7 @@ monitor_new (int x, int y, int width, int height) ret->cr = cairo_create(ret->surface); cairo_select_font_face (ret->cr, mfont? mfont: "fixed", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); - cairo_set_font_size(ret->cr, mfont_size); + cairo_set_font_size(ret->cr, mfont_size); return ret; } @@ -940,26 +940,26 @@ parse_font_list (char *str) tok = strtok(str, ","); if (tok) { - mfont = tok; // font face + mfont = tok; // font face - // if a colon is found - tok = strtok(mfont, ":"); - if(tok) { - // treat the string before the colon as the font face - mfont = tok; // font face + // if a colon is found + tok = strtok(mfont, ":"); + if(tok) { + // treat the string before the colon as the font face + mfont = tok; // font face - // if characters exist after the colon - tok = strtok(NULL, ":"); - if(tok) { - double candidate_size; - candidate_size = atof(tok); - // and the size is non-zero - if(candidate_size != 0) { - // treat the rest of the string as the font size - mfont_size = candidate_size; // font size - } - } - } + // if characters exist after the colon + tok = strtok(NULL, ":"); + if(tok) { + double candidate_size; + candidate_size = atof(tok); + // and the size is non-zero + if(candidate_size != 0) { + // treat the rest of the string as the font size + mfont_size = candidate_size; // font size + } + } + } } return;