# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 992660243 0
# Node ID 094dd478173568940def27b4f7b5c8fcc43e222c
# Parent  b9adff774e04c8edd7b2723219204a9263eae687
[gaim-migrate @ 2040]
fix for real.

committer: Tailor Script <tailor@pidgin.im>

diff -r b9adff774e04 -r 094dd4781735 ChangeLog
--- 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)
diff -r b9adff774e04 -r 094dd4781735 src/oscar.c
--- 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);