[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.34,1.35

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv9013/protocols/msn

Modified Files:
	msn.c 
Log Message:
i don't care


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- msn.c	2001/11/06 23:58:23	1.34
+++ msn.c	2001/11/07 12:17:31	1.35
@@ -954,11 +954,15 @@
 			port = 1863;
 
 		ms = g_new0(struct msn_switchboard, 1);
+		ms->fd = proxy_connect(ssaddr, port, msn_rng_connect, ms);
+		if (ms->fd < 0) {
+			g_free(ms);
+			return;
+		}
 		ms->user = g_strdup(user);
 		ms->sessid = g_strdup(sessid);
 		ms->auth = g_strdup(auth);
 		ms->gc = gc;
-		ms->fd = proxy_connect(ssaddr, port, msn_rng_connect, ms);
 	} else if (!g_strncasecmp(buf, "SYN", 3)) {
 	} else if (!g_strncasecmp(buf, "USR", 3)) {
 	} else if (!g_strncasecmp(buf, "XFR", 3)) {
@@ -999,13 +1003,21 @@
 
 			GET_NEXT(tmp);
 
-			ms->auth = g_strdup(tmp);
 			ms->fd = proxy_connect(host, port, msn_ss_xfr_connect, ms);
+			if (ms->fd < 0) {
+				msn_kill_switch(ms);
+				return;
+			}
+			ms->auth = g_strdup(tmp);
 		} else {
 			close(md->fd);
 			gaim_input_remove(md->inpa);
 			md->inpa = 0;
 			md->fd = proxy_connect(host, port, msn_login_xfr_connect, gc);
+			if (md->fd < 0) {
+				hide_login_progress(gc, "Error transfering");
+				signoff(gc);
+			}
 		}
 	} else if (isdigit(*buf)) {
 		handle_errcode(buf, TRUE);
@@ -1173,6 +1185,10 @@
 		md->inpa = 0;
 		md->fd = 0;
 		md->fd = proxy_connect(host, port, msn_login_xfr_connect, gc);
+		if (md->fd < 0) {
+			hide_login_progress(gc, "Unable to transfer");
+			signoff(gc);
+		}
 	} else {
 		if (isdigit(*buf))
 			hide_login_progress(gc, handle_errcode(buf, FALSE));
@@ -1226,6 +1242,10 @@
 	g_snprintf(gc->username, sizeof(gc->username), "%s", msn_normalize(gc->username));
 
 	md->fd = proxy_connect("messenger.hotmail.com", 1863, msn_login_connect, gc);
+	if (md->fd < 0) {
+		hide_login_progress(gc, "Unable to connect");
+		signoff(gc);
+	}
 }
 
 static void msn_close(struct gaim_connection *gc)