From 4d55ccb0ee98886f5dbddf1d6cc7e397a5d6f6d2 Mon Sep 17 00:00:00 2001 From: Nikos Tsipinakis Date: Sun, 5 Feb 2017 11:45:21 +0200 Subject: [PATCH] Check against MARKUP_NULL when checking if markup is set Setting markup_mode to -1 might not work since in some implementations enum might not be signed. For convenience, add a new enum value `MARKUP_NULL` to serve the same purpose. --- src/rules.c | 4 ++-- src/settings.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rules.c b/src/rules.c index b0d1df4..b31c1a6 100644 --- a/src/rules.c +++ b/src/rules.c @@ -15,7 +15,7 @@ void rule_apply(rule_t * r, notification * n) n->timeout = r->timeout; if (r->urgency != -1) n->urgency = r->urgency; - if (r->markup != -1) + if (r->markup != MARKUP_NULL) n->markup = r->markup; if (r->new_icon) { if(n->icon) @@ -59,7 +59,7 @@ void rule_init(rule_t * r) r->msg_urgency = -1; r->timeout = -1; r->urgency = -1; - r->markup = -1; + r->markup = MARKUP_NULL; r->new_icon = NULL; r->fg = NULL; r->bg = NULL; diff --git a/src/settings.h b/src/settings.h index a1b7f89..8e5d14e 100644 --- a/src/settings.h +++ b/src/settings.h @@ -6,7 +6,7 @@ enum alignment { left, center, right }; enum icon_position_t { icons_left, icons_right, icons_off }; enum separator_color { FOREGROUND, AUTO, FRAME, CUSTOM }; enum follow_mode { FOLLOW_NONE, FOLLOW_MOUSE, FOLLOW_KEYBOARD }; -enum markup_mode { MARKUP_NO, MARKUP_STRIP, MARKUP_FULL }; +enum markup_mode { MARKUP_NULL, MARKUP_NO, MARKUP_STRIP, MARKUP_FULL }; typedef struct _settings { bool print_notifications;