# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 966414055 0
# Node ID d904bf694bd7f1be9c5b0f9940557152a24c6eb6
# Parent  f8acdd22065afe6c59ebbba530b8801eb14b5b70
[gaim-migrate @ 710]
lalala

committer: Tailor Script <tailor@pidgin.im>

diff -r f8acdd22065a -r d904bf694bd7 src/buddy.c
--- a/src/buddy.c	Wed Aug 16 07:13:18 2000 +0000
+++ b/src/buddy.c	Wed Aug 16 08:20:55 2000 +0000
@@ -96,6 +96,7 @@
 	if (blist)
 		gtk_widget_destroy(blist);
 	blist=NULL;
+	imchatbox = NULL;
 #ifdef USE_APPLET
 	buddy_created = FALSE;
 #endif
@@ -1205,8 +1206,8 @@
 	}
 	else
 	{
-		show_log_dialog(c);
 		if (c) {
+			show_log_dialog(c);
 			set_state_lock(1);
 			gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->log_button), TRUE);
 			set_state_lock(0);
diff -r f8acdd22065a -r d904bf694bd7 src/conversation.c
--- a/src/conversation.c	Wed Aug 16 07:13:18 2000 +0000
+++ b/src/conversation.c	Wed Aug 16 08:20:55 2000 +0000
@@ -377,7 +377,7 @@
 				/* FIXME */
 			} else {
 				gdk_input_remove(c->watcher);
-				sprintf(debug_buff, "Closing DirectIM conversation (0x%p)\n", c->conn);
+				sprintf(debug_buff, "Closing DirectIM conversation (%p)\n", c->conn);
 				debug_print(debug_buff);
 				aim_conn_kill(gaim_sess, &c->conn);
 			}
diff -r f8acdd22065a -r d904bf694bd7 src/oscar.c
--- a/src/oscar.c	Wed Aug 16 07:13:18 2000 +0000
+++ b/src/oscar.c	Wed Aug 16 08:20:55 2000 +0000
@@ -127,14 +127,8 @@
 					}
 					aim_conn_kill(gaim_sess, &conn);
 				} else if (conn->type = AIM_CONN_TYPE_CHAT) {
-					struct chat_connection *c = find_oscar_chat(conn->priv);
-					if (c) {
-						struct conversation *cnv = find_chat(c->name);
-						char closebuf[128];
-						close_callback(NULL, cnv);
-						sprintf(closebuf, _("You have been disconnected from %s"), cnv->name);
-						do_error_dialog(closebuf, _("Disconnected"));
-					}
+					/* FIXME: we got disconnected from a chat room, but
+					 * libfaim won't tell us which room */
 				} else if (conn->type == AIM_CONN_TYPE_BOS) {
 					debug_print(_("major connection error\n"));
 					signoff();