From 94eecd6b3b32be1b7103bb48aa8bde92755ca4bd Mon Sep 17 00:00:00 2001 From: Bernard Nauwelaerts Date: Fri, 2 Sep 2016 11:21:36 +0200 Subject: [PATCH 1/2] fix/read-category-from-rule --- settings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/settings.c b/settings.c index c05545e..de9e93f 100644 --- a/settings.c +++ b/settings.c @@ -363,6 +363,7 @@ void load_settings(char *cmdline_config_path) r->summary = ini_get_string(cur_section, "summary", r->summary); r->body = ini_get_string(cur_section, "body", r->body); r->icon = ini_get_string(cur_section, "icon", r->icon); + r->category = ini_get_string(cur_section, "category", r->category); r->timeout = ini_get_int(cur_section, "timeout", r->timeout); r->allow_markup = ini_get_bool(cur_section, "allow_markup", r->allow_markup); r->plain_text = ini_get_bool(cur_section, "plain_text", r->plain_text); @@ -372,7 +373,7 @@ void load_settings(char *cmdline_config_path) r->bg = ini_get_string(cur_section, "background", r->bg); r->format = ini_get_string(cur_section, "format", r->format); r->new_icon = ini_get_string(cur_section, "new_icon", r->new_icon); - r->script = ini_get_string(cur_section, "script", NULL); + r->script = ini_get_string(cur_section, "script", NULL); } #ifndef STATIC_CONFIG From bd84bcb70dea54adb7c08a7bfb9a0f96a3f226a6 Mon Sep 17 00:00:00 2001 From: Bernard Nauwelaerts Date: Fri, 2 Sep 2016 14:05:24 +0200 Subject: [PATCH 2/2] fix/sigsegv-due-to-null-notification-category --- notification.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/notification.c b/notification.c index 21ccfee..af37e9e 100644 --- a/notification.c +++ b/notification.c @@ -335,6 +335,10 @@ int notification_init(notification * n, int id) n->format = settings.format; + if (n->category == NULL) { + n->category = ""; + } + rule_apply_all(n); n->urls = notification_extract_markup_urls(&(n->body)); @@ -450,10 +454,6 @@ int notification_init(notification * n, int id) n->icon = strdup(settings.icons[n->urgency]); } - if (n->category == NULL) { - n->category = ""; - } - n->timestamp = time(NULL); n->redisplayed = false;