alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #557 from mikkeloscar/bar-font-pango-optional

Browse source 
Make pango: optional for bar font
This commit is contained in:
Drew DeVault 2016-03-30 11:19:12 -04:00
parent 655b003062 63474aa04d
commit 96ef3f69c4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/commands.c
View file

@ -2263,14 +2263,14 @@ static struct cmd_results *bar_cmd_font(int argc, char **argv) {
} }
char *font = join_args(argv, argc); char *font = join_args(argv, argc);
free(config->current_bar->font);
if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) { if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) {
free(config->current_bar->font);
config->current_bar->font = font; config->current_bar->font = font;
sway_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id);
} else { } else {
sway_log(L_ERROR, "warning: non-pango font '%s' not supported.", font); config->current_bar->font = font;
} }
sway_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }