Mercurial > pidgin.yaz
changeset 2030:094dd4781735
[gaim-migrate @ 2040]
fix for real.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Sat, 16 Jun 2001 02:57:23 +0000 |
| parents | b9adff774e04 |
| children | d7a1bbf220b0 |
| files | ChangeLog src/oscar.c |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jun 16 02:33:05 2001 +0000 +++ b/ChangeLog Sat Jun 16 02:57:23 2001 +0000 @@ -8,8 +8,6 @@ * Some HTML widget changes * Can specify hosts/ports for Yahoo (thanks Jeremy Brooks) * Many many bugfixes - * Fixed an Oscar chat bug (In your user preferences, make sure - the auth port is 5190, not 9898) version 0.11.0-pre13 (06/06/2001): * Can view/set chat topic in Jabber (thanks faceprint)
--- a/src/oscar.c Sat Jun 16 02:33:05 2001 +0000 +++ b/src/oscar.c Sat Jun 16 02:57:23 2001 +0000 @@ -632,11 +632,13 @@ char *latestrelease = NULL, *latestbeta = NULL; char *latestreleaseurl = NULL, *latestbetaurl = NULL; char *latestreleaseinfo = NULL, *latestbetainfo = NULL; - int i; char *host; int port = FAIM_LOGIN_PORT; + int i; char *host; int port; struct aim_user *user; struct gaim_connection *gc = sess->aux_data; user = gc->user; + port = user->proto_opt[USEROPT_AUTHPORT][0] ? + atoi(user->proto_opt[USEROPT_AUTHPORT]) : FAIM_LOGIN_PORT, va_start(ap, command); sn = va_arg(ap, char *); @@ -1121,9 +1123,15 @@ char *ip; unsigned char *cookie; struct gaim_connection *gc = sess->aux_data; + struct aim_user *user = gc->user; struct aim_conn_t *tstconn; int i; - char *host; int port = FAIM_LOGIN_PORT, fd; + char *host; + int port; + int fd; + + port = user->proto_opt[USEROPT_AUTHPORT][0] ? + atoi(user->proto_opt[USEROPT_AUTHPORT]) : FAIM_LOGIN_PORT, va_start(ap, command); serviceid = va_arg(ap, int);