Mercurial > pidgin
changeset 23074:e4f5a65d9a77
merge of '73ff5eb429127d9a89484809ba81b50b6ed5c200'
and 'b06da0c40e8ffb855dcdb0047e94f337c62192a1'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Wed, 21 May 2008 01:46:01 +0000 |
| parents | b0c9276bff93 (current diff) e765c7261f88 (diff) |
| children | 9d331ad0a8dc |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Tue May 20 21:15:48 2008 +0000 +++ b/libpurple/protocols/jabber/message.c Wed May 21 01:46:01 2008 +0000 @@ -403,6 +403,12 @@ const char *code = xmlnode_get_attrib(child, "code"); char *code_txt = NULL; char *text = xmlnode_get_data(child); + if (!text) { + xmlnode *enclosed_text_node; + + if ((enclosed_text_node = xmlnode_get_child(child, "text"))) + text = xmlnode_get_data(enclosed_text_node); + } if(code) code_txt = g_strdup_printf(_(" (Code %s)"), code);