Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Button: fix parsing of empty config options

Browse Source
This commit is contained in:
o9000
2017-09-01 11:32:44 +02:00
parent 6605a1c3c2
commit 95d4d90efd
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/config.c
View File

@@ -779,17 +779,23 @@ void add_entry(char *key, char *value)
/* Button */ /* Button */
else if (strcmp(key, "button") == 0) { else if (strcmp(key, "button") == 0) {
panel_config.button_list = g_list_append(panel_config.button_list, create_button()); panel_config.button_list = g_list_append(panel_config.button_list, create_button());
} else if (strcmp(key, "button_icon") == 0 && strlen(value)) { } else if (strcmp(key, "button_icon") == 0) {
if (strlen(value)) {
Button *button = get_or_create_last_button(); Button *button = get_or_create_last_button();
button->backend->icon_name = strdup(value); button->backend->icon_name = strdup(value);
} else if (strcmp(key, "button_text") == 0 && strlen(value)) { }
} else if (strcmp(key, "button_text") == 0) {
if (strlen(value)) {
Button *button = get_or_create_last_button(); Button *button = get_or_create_last_button();
free_and_null(button->backend->text); free_and_null(button->backend->text);
button->backend->text = strdup(value); button->backend->text = strdup(value);
} else if (strcmp(key, "button_tooltip") == 0 && strlen(value)) { }
} else if (strcmp(key, "button_tooltip") == 0) {
if (strlen(value)) {
Button *button = get_or_create_last_button(); Button *button = get_or_create_last_button();
free_and_null(button->backend->tooltip); free_and_null(button->backend->tooltip);
button->backend->tooltip = strdup(value); button->backend->tooltip = strdup(value);
}
} else if (strcmp(key, "button_font") == 0) { } else if (strcmp(key, "button_font") == 0) {
Button *button = get_or_create_last_button(); Button *button = get_or_create_last_button();
pango_font_description_free(button->backend->font_desc); pango_font_description_free(button->backend->font_desc);