From e959bd36d4611adfb5ca6d68ae989832648416d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= Date: Sat, 2 Oct 2010 21:52:35 +0000 Subject: [PATCH] =?UTF-8?q?Strip=20the=20argument=20for=20boolean=20option?= =?UTF-8?q?s.=20Patch=20by=20Svante=20Kvarnstr=C3=B6m.=20Fixes:=20#769?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5191 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- AUTHORS | 1 + src/fe-common/core/fe-settings.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 122a8fe8..50f24ac4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -77,3 +77,4 @@ Other patches (grep for "patch" in ChangeLog) by: Lukas Mai Ismael Luceno Thomas Karpiniec + Svante Kvarnström diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c index 508c4e17..59f136b2 100644 --- a/src/fe-common/core/fe-settings.c +++ b/src/fe-common/core/fe-settings.c @@ -66,14 +66,20 @@ static void set_print_pattern(const char *pattern) static void set_boolean(const char *key, const char *value) { - if (g_ascii_strcasecmp(value, "ON") == 0) + char *stripped_value; + stripped_value = g_strdup(value); + g_strstrip(stripped_value); + + if (g_ascii_strcasecmp(stripped_value, "ON") == 0) settings_set_bool(key, TRUE); - else if (g_ascii_strcasecmp(value, "OFF") == 0) + else if (g_ascii_strcasecmp(stripped_value, "OFF") == 0) settings_set_bool(key, FALSE); - else if (g_ascii_strcasecmp(value, "TOGGLE") == 0) + else if (g_ascii_strcasecmp(stripped_value, "TOGGLE") == 0) settings_set_bool(key, !settings_get_bool(key)); else printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_NOT_TOGGLE); + + g_free(stripped_value); } static void set_int(const char *key, const char *value)