merge of '68b65e95f436625a8b1ec356a63449cf862a7f54'

Thu, 02 Jul 2009 01:52:48 +0000

author
Paul Aurich <darkrain42@pidgin.im>
date
Thu, 02 Jul 2009 01:52:48 +0000
changeset 27475
59b7166fe4b0
parent 27472
68b65e95f436 (current diff)
parent 27474
60afa581988d (diff)
child 27476
d44640cb5686

merge of '68b65e95f436625a8b1ec356a63449cf862a7f54'
and '60afa581988d1e7c7b6719a2bce4be328cb6d898'

--- 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 */

mercurial