Mercurial > pidgin.yaz
changeset 22194:17e21fa1db57
merge of '4b11e0842d46778d47f4901ed6e00169c970471d'
and '67cb3e90607a4b30b35a7d3dfe73b7eec371ad3e'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 24 Jan 2008 05:25:02 +0000 |
| parents | 3634d27ec6f1 (diff) 6d9757319bf6 (current diff) |
| children | 6419554aadd9 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/util.c Thu Jan 24 05:19:51 2008 +0000 +++ b/libpurple/util.c Thu Jan 24 05:25:02 2008 +0000 @@ -1445,7 +1445,6 @@ ALLOW_TAG("pre"); ALLOW_TAG("q"); ALLOW_TAG("span"); - ALLOW_TAG("strong"); ALLOW_TAG("ul"); @@ -1465,9 +1464,14 @@ plain = g_string_append_c(plain, '\n'); continue; } - if(!g_ascii_strncasecmp(c, "<b>", 3) || !g_ascii_strncasecmp(c, "<bold>", strlen("<bold>"))) { + if(!g_ascii_strncasecmp(c, "<b>", 3) || !g_ascii_strncasecmp(c, "<bold>", strlen("<bold>")) || !g_ascii_strncasecmp(c, "<strong>", strlen("<strong>"))) { struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1); - pt->src_tag = *(c+2) == '>' ? "b" : "bold"; + if (*(c+2) == '>') + pt->src_tag = "b"; + else if (*(c+2) == 'o') + pt->src_tag = "bold"; + else + pt->src_tag = "strong"; pt->dest_tag = "span"; tags = g_list_prepend(tags, pt); c = strchr(c, '>') + 1;