[Gaim-commits] CVS: gaim/src/protocols/msn ft.c,1.2,1.3 msn.c,1.142,1.143 switchboard.c,1.2,1.3

[Nathan W. <fac...@us...>]

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

Modified Files:
	ft.c msn.c switchboard.c 
Log Message:
This will let you set up different proxy settings for different accounts.

Mainly useful to the corporate users that need to connect to an internal
jabber server, and still want to connect to "external" stuff through a
proxy, or something along those lines.  I'm sure someone will come up with
another use for it.


Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/ft.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ft.c	6 Feb 2003 22:27:29 -0000	1.2
+++ ft.c	2 Mar 2003 18:48:00 -0000	1.3
@@ -449,7 +449,7 @@
 
 			strncpy(ip_s, ip, sizeof(ip_s));
 
-			if (proxy_connect(ip_s, atoi(port_s),
+			if (proxy_connect(xfer->account, ip_s, atoi(port_s),
 							  msn_msnftp_connect, xfer) != 0) {
 
 				gaim_xfer_cancel(xfer);

Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- msn.c	23 Feb 2003 02:21:17 -0000	1.142
+++ msn.c	2 Mar 2003 18:48:00 -0000	1.143
@@ -646,7 +646,7 @@
 			port = 1863;
 
 		ms = g_new0(struct msn_switchboard, 1);
-		if (proxy_connect(ssaddr, port, msn_rng_connect, ms) != 0) {
+		if (proxy_connect(gc->account, ssaddr, port, msn_rng_connect, ms) != 0) {
 			g_free(ms);
 			return 1;
 		}
@@ -784,7 +784,7 @@
 			close(md->fd);
 			gaim_input_remove(md->inpa);
 			md->inpa = 0;
-			if (proxy_connect(host, port, msn_login_xfr_connect, gc) != 0) {
+			if (proxy_connect(gc->account, host, port, msn_login_xfr_connect, gc) != 0) {
 				hide_login_progress(gc, _("Error transferring"));
 				signoff(gc);
 				return 0;
@@ -1080,7 +1080,7 @@
 		md->inpa = 0;
 		md->fd = 0;
 		md->sl = time(NULL);
-		if (proxy_connect(host, port, msn_login_xfr_connect, gc) != 0) {
+		if (proxy_connect(gc->account, host, port, msn_login_xfr_connect, gc) != 0) {
 			hide_login_progress(gc, _("Unable to transfer"));
 			signoff(gc);
 		}
@@ -1194,7 +1194,7 @@
 
 	g_snprintf(gc->username, sizeof(gc->username), "%s", msn_normalize(gc->username));
 
-	if (proxy_connect(account->proto_opt[USEROPT_MSNSERVER][0] ?
+	if (proxy_connect(account, account->proto_opt[USEROPT_MSNSERVER][0] ?
 				account->proto_opt[USEROPT_MSNSERVER] : MSN_SERVER,
 				account->proto_opt[USEROPT_MSNPORT][0] ?
 				atoi(account->proto_opt[USEROPT_MSNPORT]) : MSN_PORT,

Index: switchboard.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/switchboard.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- switchboard.c	6 Feb 2003 22:27:29 -0000	1.2
+++ switchboard.c	2 Mar 2003 18:48:01 -0000	1.3
@@ -525,7 +525,8 @@
 	if (ms == NULL)
 		return NULL;
 
-	if (proxy_connect((char *)host, port, msn_ss_xfr_connect, ms) != 0) {
+	if (proxy_connect(gc->account, (char *)host, port, msn_ss_xfr_connect,
+				ms) != 0) {
 		msn_kill_switch(ms);
 
 		return NULL;