Mercurial > pidgin
comparison src/protocols/msn/msn.c @ 4634:d19872836812
[gaim-migrate @ 4941]
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.
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Sun, 02 Mar 2003 18:48:02 +0000 |
parents | 864518c3767d |
children | 283fb289c510 |
comparison
equal
deleted
inserted
replaced
4633:812148fb2e2f | 4634:d19872836812 |
---|---|
644 port = atoi(x); | 644 port = atoi(x); |
645 } else | 645 } else |
646 port = 1863; | 646 port = 1863; |
647 | 647 |
648 ms = g_new0(struct msn_switchboard, 1); | 648 ms = g_new0(struct msn_switchboard, 1); |
649 if (proxy_connect(ssaddr, port, msn_rng_connect, ms) != 0) { | 649 if (proxy_connect(gc->account, ssaddr, port, msn_rng_connect, ms) != 0) { |
650 g_free(ms); | 650 g_free(ms); |
651 return 1; | 651 return 1; |
652 } | 652 } |
653 ms->user = g_strdup(user); | 653 ms->user = g_strdup(user); |
654 ms->sessid = g_strdup(sessid); | 654 ms->sessid = g_strdup(sessid); |
782 ms->auth = g_strdup(tmp); | 782 ms->auth = g_strdup(tmp); |
783 } else { | 783 } else { |
784 close(md->fd); | 784 close(md->fd); |
785 gaim_input_remove(md->inpa); | 785 gaim_input_remove(md->inpa); |
786 md->inpa = 0; | 786 md->inpa = 0; |
787 if (proxy_connect(host, port, msn_login_xfr_connect, gc) != 0) { | 787 if (proxy_connect(gc->account, host, port, msn_login_xfr_connect, gc) != 0) { |
788 hide_login_progress(gc, _("Error transferring")); | 788 hide_login_progress(gc, _("Error transferring")); |
789 signoff(gc); | 789 signoff(gc); |
790 return 0; | 790 return 0; |
791 } | 791 } |
792 } | 792 } |
1078 close(md->fd); | 1078 close(md->fd); |
1079 gaim_input_remove(md->inpa); | 1079 gaim_input_remove(md->inpa); |
1080 md->inpa = 0; | 1080 md->inpa = 0; |
1081 md->fd = 0; | 1081 md->fd = 0; |
1082 md->sl = time(NULL); | 1082 md->sl = time(NULL); |
1083 if (proxy_connect(host, port, msn_login_xfr_connect, gc) != 0) { | 1083 if (proxy_connect(gc->account, host, port, msn_login_xfr_connect, gc) != 0) { |
1084 hide_login_progress(gc, _("Unable to transfer")); | 1084 hide_login_progress(gc, _("Unable to transfer")); |
1085 signoff(gc); | 1085 signoff(gc); |
1086 } | 1086 } |
1087 return 0; | 1087 return 0; |
1088 } else { | 1088 } else { |
1192 | 1192 |
1193 set_login_progress(gc, 1, _("Connecting")); | 1193 set_login_progress(gc, 1, _("Connecting")); |
1194 | 1194 |
1195 g_snprintf(gc->username, sizeof(gc->username), "%s", msn_normalize(gc->username)); | 1195 g_snprintf(gc->username, sizeof(gc->username), "%s", msn_normalize(gc->username)); |
1196 | 1196 |
1197 if (proxy_connect(account->proto_opt[USEROPT_MSNSERVER][0] ? | 1197 if (proxy_connect(account, account->proto_opt[USEROPT_MSNSERVER][0] ? |
1198 account->proto_opt[USEROPT_MSNSERVER] : MSN_SERVER, | 1198 account->proto_opt[USEROPT_MSNSERVER] : MSN_SERVER, |
1199 account->proto_opt[USEROPT_MSNPORT][0] ? | 1199 account->proto_opt[USEROPT_MSNPORT][0] ? |
1200 atoi(account->proto_opt[USEROPT_MSNPORT]) : MSN_PORT, | 1200 atoi(account->proto_opt[USEROPT_MSNPORT]) : MSN_PORT, |
1201 msn_login_connect, gc) != 0) { | 1201 msn_login_connect, gc) != 0) { |
1202 hide_login_progress(gc, _("Unable to connect")); | 1202 hide_login_progress(gc, _("Unable to connect")); |