Mercurial > pidgin.yaz
diff src/protocols/jabber/jabber.c @ 10941:cef48e318125
[gaim-migrate @ 12731]
sick of having my tree be so far out of sync...here's all my jabber stuff
most notable is the "iChat" buddy icon support
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Thu, 26 May 2005 04:13:06 +0000 |
| parents | bf5e48215158 |
| children | 27f0322f06f7 |
line wrap: on
line diff
--- a/src/protocols/jabber/jabber.c Thu May 26 03:54:25 2005 +0000 +++ b/src/protocols/jabber/jabber.c Thu May 26 04:13:06 2005 +0000 @@ -826,11 +826,11 @@ jabber_stream_init(js); break; case JABBER_STREAM_CONNECTED: - gaim_connection_set_state(js->gc, GAIM_CONNECTED); jabber_roster_request(js); gpresence = gaim_account_get_presence(js->gc->account); status = gaim_presence_get_active_status(gpresence); jabber_presence_send(js->gc->account, status); + gaim_connection_set_state(js->gc, GAIM_CONNECTED); jabber_disco_items_server(js); break; } @@ -947,6 +947,7 @@ stripped = gaim_markup_strip_html(jbr->status); text = g_markup_escape_text(stripped, -1); g_free(stripped); + /* XXX: need some nl to br love here */ } g_string_append_printf(ret, "\n<b>%s:</b> %s%s%s", @@ -1618,7 +1619,10 @@ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_bool_new(_("Force old SSL"), "old_ssl", FALSE); + option = gaim_account_option_bool_new(_("Require TLS"), "require_tls", TRUE); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + + option = gaim_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);