# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1246499568 0
# Node ID fd45bfd8987260270c01223560e0b90b4f422bb9
# Parent  f22b8f624a00d83020ad8f79c4c355f8eb2073ca# Parent  76cf0b261e25828d9d574de993c9c8762f425556
merge of '6b55733f733881e690313c87ac44fba18f382ce1'
     and 'aa1b0003a1e5ecb2e83de16870e1dab4ee4e94cc'

diff -r f22b8f624a00 -r fd45bfd89872 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed Jul 01 16:08:55 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Thu Jul 02 01:52:48 2009 +0000
@@ -1534,6 +1534,7 @@
 		gc->flags |= PURPLE_CONNECTION_AUTO_RESP;
 	}
 
+	od->default_port = purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT);
 	od->use_ssl = purple_account_get_bool(account, "use_ssl", OSCAR_DEFAULT_USE_SSL);
 
 	/* Connect to core Purple signals */