Revision 1e5814c18dbd7349240ceeec8f3d25583e42a7bd
markdoliner at pidgin.im
markdoliner at pidgin.im
Tue Mar 13 03:33:41 EDT 2007
o -----------------------------------------------------------------
| Revision: 1e5814c18dbd7349240ceeec8f3d25583e42a7bd
| Ancestor: d5a7d7f68fd2f50eec5a01df4ff01b1cace1319f
| Author: markdoliner at pidgin.im
| Date: 2007-03-13T07:33:08
| Branch: im.pidgin.pidgin
|
| Modified files:
| libpurple/connection.c
|
| ChangeLog:
|
| 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 <stream:error/> 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.
|
| ============================================================
| --- libpurple/connection.c be8dc3f9bcde569ab9c715d50f7dbc838d8acdbf
| +++ libpurple/connection.c 2780735e26f07cdcd53ed64224722280991e995d
| @@ -434,8 +434,12 @@ gaim_connection_error(GaimConnection *gc
| 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)
| return;
To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 1e5814c18dbd7349240ceeec8f3d25583e42a7bd
More information about the Commits
mailing list