diff options
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/core/themes.c | 14 | ||||
| -rw-r--r-- | src/fe-common/irc/module-formats.c | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c index a8e7c3b0..66c023c9 100644 --- a/src/fe-common/core/themes.c +++ b/src/fe-common/core/themes.c @@ -274,6 +274,20 @@ static char *theme_format_expand_abstract(THEME_REC *theme, data = theme_format_expand_data(theme, formatp, default_color, NULL, 0); + len = strlen(data); + if (len > 1 && isdigit(data[len-1]) && data[len-2] == '$') { + /* ends with $<digit> .. this breaks things if next + character is digit or '-' */ + char digit, *tmp; + + tmp = data; + digit = tmp[len-1]; + tmp[len-1] = '\0'; + + data = g_strdup_printf("%s{%c}", tmp, digit); + g_free(tmp); + } + ret = parse_special_string(abstract, NULL, NULL, data, NULL); g_free(abstract); g_free(data); diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c index 578cea16..d0f1a3a5 100644 --- a/src/fe-common/irc/module-formats.c +++ b/src/fe-common/irc/module-formats.c @@ -118,7 +118,7 @@ FORMAT_REC fecommon_irc_formats[] = { { "own_notice", "{ownnotice notice{ownnotice_target $0}}$1", 2, { 0, 0 } }, { "own_action", "{ownaction $0}$1", 2, { 0, 0 } }, { "own_ctcp", "{ownctcp ctcp{ownctcp_target $0}}$1 $2", 3, { 0, 0, 0 } }, - { "own_wall", "{ownwall Wall{ownwall_channel}}$1", 2, { 0, 0 } }, + { "own_wall", "{ownwall Wall{ownwall_channel $0}}$1", 2, { 0, 0 } }, /* ---- */ { NULL, "Received messages", 0 }, |