Mercurial > pidgin
changeset 27242:fd45bfd89872
merge of '6b55733f733881e690313c87ac44fba18f382ce1'
and 'aa1b0003a1e5ecb2e83de16870e1dab4ee4e94cc'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 02 Jul 2009 01:52:48 +0000 |
| parents | f22b8f624a00 (current diff) 76cf0b261e25 (diff) |
| children | ecdc58da4cdd |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 */