Mercurial > pidgin3 / file diff

--- a/src/protocols/jabber/jabber.c	Mon Sep 17 19:22:21 2001 +0000
+++ b/src/protocols/jabber/jabber.c	Mon Sep 17 21:30:47 2001 +0000
@@ -424,14 +424,14 @@
 	jd = gc->proto_data;
 	j = jd->jc;
 
+	if (j->fd != source)
+		j->fd = source;
+
 	if (source == -1) {
 		STATE_EVT(JCONN_STATE_OFF)
 		return;
 	}
 
-	if (j->fd != source)
-		j->fd = source;
-
 	j->state = JCONN_STATE_CONNECTED;
 	STATE_EVT(JCONN_STATE_CONNECTED)
 
@@ -1216,7 +1216,8 @@
 	struct jabber_data *jd = gc->proto_data;
 	g_hash_table_foreach_remove(jd->hash, jabber_destroy_hash, NULL);
 	g_hash_table_destroy(jd->hash);
-	gaim_input_remove(gc->inpa);
+	if (gc->inpa)
+		gaim_input_remove(gc->inpa);
 	close(jd->jc->fd);
 	g_timeout_add(50, jabber_free, jd->jc);
 	jd->jc = NULL;