# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 966458679 0
# Node ID 1d989562af1f37244e765350d93cac369782721b
# Parent  20553b584ccbe3b4a3542b3b6f51f880997eaff6
[gaim-migrate @ 714]
ya ha ha

committer: Tailor Script <tailor@pidgin.im>

diff -r 20553b584ccb -r 1d989562af1f TODO
--- a/TODO	Wed Aug 16 20:13:57 2000 +0000
+++ b/TODO	Wed Aug 16 20:44:39 2000 +0000
@@ -6,7 +6,25 @@
 	Redesign the Foreground/Background color options under preferences.
 	Add ability to conersaton window to allow changing of foreground/
 		background colours per conversation window. 
-	Possibly make it so that you can create 'aliases' for buddies
-		on your buddy list.  This won't be too hard it'll just
-		take a bit of work.  Maybe we'll save this one for the
+	Have a page in the prefs for the Applet
+	Redesign the Away Messages page in the prefs
+	Somehow make it so plugins can communicate
+
+	Syd is cool and gave all of these ideas:
+		Have multiple tickers in the same window, one for buddies
+			like it is now, one for who just came online/offline
+			(scrolled faster possibly because that doesn't
+			happen very often), etc.
+		Have tooltips on the passing buddies on the ticker
+		Have a stock ticker (a plugin could easily make use of
+			GtkTicker)
+		Have Alt access the menu in the buddy list, and ctl-char
+			access items in those menus
+
+
+	Possibly make it so that you can create ICQ-style 'aliases' for
+		buddies on your buddy list.  This won't be too hard it'll
+		just take a bit of work.  Maybe we'll save this one for the
 		release after our next release.
+	Maybe someday in the future gaim will be able to support multiple
+		connections, so you can log on as 2+ names at once. Maybe.
diff -r 20553b584ccb -r 1d989562af1f src/oscar.c
--- a/src/oscar.c	Wed Aug 16 20:13:57 2000 +0000
+++ b/src/oscar.c	Wed Aug 16 20:44:39 2000 +0000
@@ -116,7 +116,6 @@
 			if (aim_get_command(gaim_sess, conn) >= 0) {
 				aim_rxdispatch(gaim_sess);
 			} else {
-				debug_print(_("connection error!\n"));
 				if (conn->type == AIM_CONN_TYPE_RENDEZVOUS &&
 				    conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM) {
 					struct conversation *cnv =
@@ -126,15 +125,19 @@
 						make_direct(cnv, FALSE, NULL, 0);
 					}
 					aim_conn_kill(gaim_sess, &conn);
-				} else if (conn->type = AIM_CONN_TYPE_CHAT) {
-					/* FIXME: we got disconnected from a chat room, but
-					 * libfaim won't tell us which room */
-				} else if (conn->type == AIM_CONN_TYPE_BOS) {
+				} else if ((conn->type == AIM_CONN_TYPE_BOS) ||
+					   !(aim_getconn_type(gaim_sess, AIM_CONN_TYPE_BOS))) {
 					debug_print(_("major connection error\n"));
 					signoff();
 					hide_login_progress(_("Disconnected."));
 					auth_failed();
+				} else if (conn->type = AIM_CONN_TYPE_CHAT) {
+					/* FIXME: we got disconnected from a chat room, but
+					 * libfaim won't tell us which room */
+					debug_print("connection error for chat...\n");
+					aim_conn_kill(gaim_sess, &conn);
 				} else {
+					debug_print("holy crap! generic connection error!\n");
 					aim_conn_kill(gaim_sess, &conn);
 				}
 			}