# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1171342925 0
# Node ID fc586f7f23bd6dd569f8bc292c736253325e01eb
# Parent  66dc2367b137a7dbdd496607e63ad2c78b667f07# Parent  3548e64b024581b1a4f10cc0a59bc24a74fba09e
merge of '7822ac971c736a7e6545da828b1b79db67ad732f'
     and 'faa53491f8f01ef4da3e5c311163dd625bbdff02'

diff -r 3548e64b0245 -r fc586f7f23bd libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Mon Feb 12 08:43:04 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Tue Feb 13 05:02:05 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) {