Mercurial > pidgin
changeset 15628:2f0f563b3579
merge of '7822ac971c736a7e6545da828b1b79db67ad732f'
and 'edc9bd8e3fe860539f170f241e440e214993fcaf'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 13 Feb 2007 07:03:51 +0000 |
parents | 66dc2367b137 (diff) 2261750cf4e9 (current diff) |
children | 68798ffeb321 |
files | |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Tue Feb 13 06:58:13 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue Feb 13 07:03:51 2007 +0000 @@ -475,8 +475,13 @@ gpointer data) { GaimConnection *gc = data; - JabberStream *js = gc->proto_data; + JabberStream *js; + /* If the connection is already disconnected, we don't need to do anything else */ + if(!GAIM_CONNECTION_IS_VALID(gc)) + return; + + js = gc->proto_data; js->gsc = NULL; switch(error) {