# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1065538410 0
# Node ID 89dc8a119918ace32019b321361b13624349221f
# Parent  071dee25c48e0c5b4d22993549d1344eb57a429b
[gaim-migrate @ 7752]
gcc needs to stop letting me print NULL

committer: Tailor Script <tailor@pidgin.im>

diff -r 071dee25c48e -r 89dc8a119918 src/protocols/jabber/presence.c
--- a/src/protocols/jabber/presence.c	Tue Oct 07 14:20:48 2003 +0000
+++ b/src/protocols/jabber/presence.c	Tue Oct 07 14:53:30 2003 +0000
@@ -162,10 +162,12 @@
 	if(type && !strcasecmp(type, "error")) {
 		state = JABBER_STATE_ERROR;
 		if((y = xmlnode_get_child(packet, "error")) != NULL) {
+			/* XXX: need to handle new XMPP-style errors */
 			char *txt = xmlnode_get_data(y);
 			jb->error_msg = g_strdup_printf(_("%s (Code %s)"),
-					txt, xmlnode_get_attrib(y, "code"));
-			g_free(txt);
+					txt ? txt : "Error", xmlnode_get_attrib(y, "code"));
+			if(txt)
+				g_free(txt);
 		} else {
 			jb->error_msg = g_strdup(_("Unknown Error in presence"));
 		}