Mercurial > pidgin
changeset 29735:54289a753667
merge of 'd3c0fb0d541e286033c180e2104c09174255a31b'
and 'e86a2edf1a808d62825fa1e6109ead33f72982d6'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 15 Apr 2010 04:21:55 +0000 |
| parents | b00abe5ec15e (diff) c66e766acb06 (current diff) |
| children | 787d82881a3e |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Thu Apr 15 01:01:36 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Thu Apr 15 04:21:55 2010 +0000 @@ -166,6 +166,8 @@ char *msg = jabber_parse_error(js, packet, &reason); purple_connection_error_reason(js->gc, reason, msg); g_free(msg); + + return; } jabber_session_init(js);