theme fixes

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@880 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-11-26 05:08:11 +00:00 committed by cras
commit 7fbc915516
4 changed files with 102 additions and 5 deletions

View file

@ -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);

View file

@ -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 },