# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 990354947 0
# Node ID 466fc4ada7cbaf4ab98d4e44085c0284d40d7ce6
# Parent  8d758ff5957e43e2c0b6c6095667c073cc1a0d72
[gaim-migrate @ 1876]
more proxy fixes.

committer: Tailor Script <tailor@pidgin.im>

diff -r 8d758ff5957e -r 466fc4ada7cb plugins/irc.c
--- a/plugins/irc.c	Sun May 20 09:09:02 2001 +0000
+++ b/plugins/irc.c	Sun May 20 10:35:47 2001 +0000
@@ -1863,7 +1863,7 @@
 			atoi(user->proto_opt[USEROPT_PROXYTYPE]),
 			user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS],
 			irc_login_callback, gc);
-	if (user->gc && (idata->fd < 0)) {
+	if (!user->gc || (idata->fd < 0)) {
 		hide_login_progress(gc, "Unable to create socket");
 		signoff(gc);
 		return;
diff -r 8d758ff5957e -r 466fc4ada7cb plugins/jabber/jabber.c
--- a/plugins/jabber/jabber.c	Sun May 20 09:09:02 2001 +0000
+++ b/plugins/jabber/jabber.c	Sun May 20 10:35:47 2001 +0000
@@ -477,7 +477,7 @@
 			atoi(user->proto_opt[USEROPT_PROXYTYPE]),
 			user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS],
 			gjab_connected, j);
-	if (user->gc && (j->fd < 0)) {
+	if (!user->gc || (j->fd < 0)) {
 		STATE_EVT(JCONN_STATE_OFF)
 		return;
 	}
diff -r 8d758ff5957e -r 466fc4ada7cb plugins/msn/msn.c
--- a/plugins/msn/msn.c	Sun May 20 09:09:02 2001 +0000
+++ b/plugins/msn/msn.c	Sun May 20 10:35:47 2001 +0000
@@ -571,7 +571,7 @@
 			msn_answer_callback, mc);
 		g_strfreev(address);
 		g_strfreev(res);
-		if (user->gc && (mc->fd < 0)) {
+		if (!user->gc || (mc->fd < 0)) {
 			/* Looks like we had an error connecting. */
 			g_free(mc->session);
 			g_free(mc->secret);
@@ -813,7 +813,7 @@
 			atoi(gc->user->proto_opt[USEROPT_PROXYTYPE]),
 			gc->user->proto_opt[USEROPT_USER], gc->user->proto_opt[USEROPT_PASS],
 			msn_login_callback, gc);
-		if (user->gc && (md->fd < 0)) {
+		if (!user->gc || (md->fd < 0)) {
 			g_strfreev(res);
 			hide_login_progress(gc, "Error connecting to server");
 			signoff(gc);
@@ -919,7 +919,7 @@
 			atoi(user->proto_opt[USEROPT_PROXYTYPE]),
 			user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS],
 			msn_login_callback, gc);
-	if (user->gc && (md->fd < 0)) {
+	if (!user->gc || (md->fd < 0)) {
 		hide_login_progress(gc, "Error connecting to server");
 		signoff(gc);
 		return;
diff -r 8d758ff5957e -r 466fc4ada7cb src/toc.c
--- a/src/toc.c	Sun May 20 09:09:02 2001 +0000
+++ b/src/toc.c	Sun May 20 10:35:47 2001 +0000
@@ -156,7 +156,7 @@
 			  user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS],
 			  toc_login_callback, gc);
 
-	if (user->gc && (tdt->toc_fd < 0)) {
+	if (!user->gc || (tdt->toc_fd < 0)) {
 		g_snprintf(buf, sizeof(buf), "Connect to %s failed", user->proto_opt[USEROPT_AUTH]);
 		hide_login_progress(gc, buf);
 		signoff(gc);