Mercurial > pidgin.yaz
changeset 31326:9fccebaac7c5
merge of 'a05232ffa430529ccf3e31b0b2006324a28ef9bd'
and 'df86722dad2f9f8e11e9f107a7ff3abc05b98594'
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Mon, 01 Nov 2010 07:12:08 +0000 |
| parents | 204827933880 (diff) c9fe019788a6 (current diff) |
| children | d87c49564564 d9e21370fca0 7c5a78a2cc0d |
| files | libpurple/protocols/msn/dialog.c libpurple/protocols/msn/dialog.h libpurple/protocols/msn/sync.c libpurple/protocols/msn/sync.h |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Mon Nov 01 05:43:02 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Nov 01 07:12:08 2010 +0000 @@ -5678,7 +5678,7 @@ PurpleAccountOption *option; static gboolean init = FALSE; - option = purple_account_option_string_new(_("Server"), "server", get_login_server(is_icq, FALSE)); + option = purple_account_option_string_new(_("Server"), "server", get_login_server(is_icq, OSCAR_DEFAULT_USE_SSL)); prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option); option = purple_account_option_int_new(_("Port"), "port", OSCAR_DEFAULT_LOGIN_PORT);