Mercurial > pidgin.yaz
comparison src/protocols/jabber/jabber.c @ 7274:448e39ace278
[gaim-migrate @ 7851]
Added a parameter to gaim_ssl_connect() to specify an optional error
callback. MSN takes advantage of it, but since I can't reproduce the errors
here, I'm not positive it works. It should though! Famous last words.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Wed, 15 Oct 2003 06:32:13 +0000 |
| parents | deab8d8bbb4e |
| children | 632cee95cc5c |
comparison
equal
deleted
inserted
replaced
| 7273:d152ea377e4a | 7274:448e39ace278 |
|---|---|
| 335 static void tls_init(JabberStream *js) | 335 static void tls_init(JabberStream *js) |
| 336 { | 336 { |
| 337 gaim_input_remove(js->gc->inpa); | 337 gaim_input_remove(js->gc->inpa); |
| 338 js->gc->inpa = 0; | 338 js->gc->inpa = 0; |
| 339 js->gsc = gaim_ssl_connect_fd(js->gc->account, js->fd, | 339 js->gsc = gaim_ssl_connect_fd(js->gc->account, js->fd, |
| 340 jabber_login_callback_ssl, js->gc); | 340 jabber_login_callback_ssl, NULL, js->gc); |
| 341 } | 341 } |
| 342 | 342 |
| 343 static void | 343 static void |
| 344 jabber_login(GaimAccount *account) | 344 jabber_login(GaimAccount *account) |
| 345 { | 345 { |
| 380 | 380 |
| 381 if(gaim_account_get_bool(account, "old_ssl", FALSE) | 381 if(gaim_account_get_bool(account, "old_ssl", FALSE) |
| 382 && gaim_ssl_is_supported()) { | 382 && gaim_ssl_is_supported()) { |
| 383 js->gsc = gaim_ssl_connect(account, server, | 383 js->gsc = gaim_ssl_connect(account, server, |
| 384 gaim_account_get_int(account, "port", 5222), | 384 gaim_account_get_int(account, "port", 5222), |
| 385 jabber_login_callback_ssl, gc); | 385 jabber_login_callback_ssl, NULL, gc); |
| 386 } | 386 } |
| 387 | 387 |
| 388 if(!js->gsc) { | 388 if(!js->gsc) { |
| 389 rc = gaim_proxy_connect(account, server, | 389 rc = gaim_proxy_connect(account, server, |
| 390 gaim_account_get_int(account, "port", 5222), | 390 gaim_account_get_int(account, "port", 5222), |
| 668 | 668 |
| 669 if(gaim_account_get_bool(account, "old_ssl", FALSE) | 669 if(gaim_account_get_bool(account, "old_ssl", FALSE) |
| 670 && gaim_ssl_is_supported()) { | 670 && gaim_ssl_is_supported()) { |
| 671 js->gsc = gaim_ssl_connect(account, server, | 671 js->gsc = gaim_ssl_connect(account, server, |
| 672 gaim_account_get_int(account, "port", 5222), | 672 gaim_account_get_int(account, "port", 5222), |
| 673 jabber_login_callback_ssl, gc); | 673 jabber_login_callback_ssl, NULL, gc); |
| 674 } | 674 } |
| 675 | 675 |
| 676 if(!js->gsc) { | 676 if(!js->gsc) { |
| 677 rc = gaim_proxy_connect(account, server, | 677 rc = gaim_proxy_connect(account, server, |
| 678 gaim_account_get_int(account, "port", 5222), | 678 gaim_account_get_int(account, "port", 5222), |