comparison: src/protocols/jabber/jabber.c
src/protocols/jabber/jabber.c
- changeset 6880
- 69def428c334
- parent 6817
- 23cea6ca0b8e
- child 6953
- 2e781bcc1f23
equal
deleted
inserted
replaced
| 6879:cc7abcef355c | 6880:69def428c334 |
|---|---|
| 894 gjc->parser = XML_ParserCreate(NULL); | 894 gjc->parser = XML_ParserCreate(NULL); |
| 895 XML_SetUserData(gjc->parser, (void *)gjc); | 895 XML_SetUserData(gjc->parser, (void *)gjc); |
| 896 XML_SetElementHandler(gjc->parser, startElement, endElement); | 896 XML_SetElementHandler(gjc->parser, startElement, endElement); |
| 897 XML_SetCharacterDataHandler(gjc->parser, charData); | 897 XML_SetCharacterDataHandler(gjc->parser, charData); |
| 898 | 898 |
| 899 if(gaim_account_get_bool(account, "ssl", FALSE) | 899 if(gaim_account_get_bool(account, "old_ssl", FALSE) |
| 900 && gaim_ssl_is_supported()) { | 900 && gaim_ssl_is_supported()) { |
| 901 gjc->gsc = gaim_ssl_connect(account, server, port, | 901 gjc->gsc = gaim_ssl_connect(account, server, port, |
| 902 gjab_ssl_connected, GJ_GC(gjc)); | 902 gjab_ssl_connected, GJ_GC(gjc)); |
| 903 } | 903 } |
| 904 | 904 |
| 4518 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); | 4518 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); |
| 4519 | 4519 |
| 4520 /* Account Options */ | 4520 /* Account Options */ |
| 4521 | 4521 |
| 4522 if(gaim_ssl_is_supported()) { | 4522 if(gaim_ssl_is_supported()) { |
| 4523 option = gaim_account_option_bool_new(_("Use SSL"), "ssl", FALSE); | 4523 option = gaim_account_option_bool_new(_("Use SSL"), "old_ssl", FALSE); |
| 4524 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, | 4524 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
| 4525 option); | 4525 option); |
| 4526 } | 4526 } |
| 4527 | 4527 |
| 4528 option = gaim_account_option_int_new(_("Port"), "port", DEFAULT_PORT); | 4528 option = gaim_account_option_int_new(_("Port"), "port", DEFAULT_PORT); |
