# HG changeset patch # User Mark Doliner # Date 1173771188 0 # Node ID b25acae693cda83d2a68a1a114cf90864b42a425 # Parent e926951e61fe02e747fd993fa9ad7f8029f5e06f Change connection.c:gaim_connection_error() to still work even if the message parameter is NULL. There's no reason to error-out of that function just because some yuppie didn't pass us an error message. But we still log a critical message, so those of you at home running with fatal_criticals will still crash. I noticed this because Jabber isn't handling correctly right now. Anyone else notice this? The code is written to look for "stream:error", but our xmlnode stuff just sees "error" (even though the "stream:error" format is sent over the wire). I think it's because of the libxml change. To reproduce the problem, sign onto the same resource twice and note that the error message that Gaim gives you sucks. diff -r e926951e61fe -r b25acae693cd libpurple/connection.c --- a/libpurple/connection.c Tue Mar 13 07:19:06 2007 +0000 +++ b/libpurple/connection.c Tue Mar 13 07:33:08 2007 +0000 @@ -434,7 +434,11 @@ GaimConnectionUiOps *ops; g_return_if_fail(gc != NULL); - g_return_if_fail(text != NULL); + + if (text != NULL) { + g_critical("gaim_connection_error: check `text != NULL' failed"); + text = _("Unknown error"); + } /* If we've already got one error, we don't need any more */ if (gc->disconnect_timeout)