# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1211334361 0
# Node ID e4f5a65d9a774b179ee86a01dc91ab37e99788cc
# Parent  b0c9276bff93b04be8677249c5c96b3279912277# Parent  e765c7261f88c724ac3cb46ea686d2ab71aa64ab
merge of '73ff5eb429127d9a89484809ba81b50b6ed5c200'
     and 'b06da0c40e8ffb855dcdb0047e94f337c62192a1'

diff -r b0c9276bff93 -r e4f5a65d9a77 libpurple/protocols/jabber/message.c
--- 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);