Mercurial > pidgin
comparison libgaim/protocols/jabber/jabber.c @ 14961:8a564904e9b5
[gaim-migrate @ 17740]
As with jabber_recv_cb_ssl(), jabber_login_callback_ssl() needs to either be cancelled properly or check to ensure its GaimConnection is valid when it is triggered. Since the former is not done yet, I've added the latter, with the same TODO comment as is present in jabber_recv_cb_ssl().
committer: Tailor Script <tailor@pidgin.im>
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Sun, 12 Nov 2006 18:34:25 +0000 |
parents | 118fd0dc5b6e |
children | a259abeeee27 |
comparison
equal
deleted
inserted
replaced
14960:91d8fb14bd27 | 14961:8a564904e9b5 |
---|---|
428 static void | 428 static void |
429 jabber_login_callback_ssl(gpointer data, GaimSslConnection *gsc, | 429 jabber_login_callback_ssl(gpointer data, GaimSslConnection *gsc, |
430 GaimInputCondition cond) | 430 GaimInputCondition cond) |
431 { | 431 { |
432 GaimConnection *gc = data; | 432 GaimConnection *gc = data; |
433 JabberStream *js = gc->proto_data; | 433 JabberStream *js; |
434 | |
435 /* TODO: It should be possible to make this check unnecessary */ | |
436 if(!GAIM_CONNECTION_IS_VALID(gc)) { | |
437 gaim_ssl_close(gsc); | |
438 return; | |
439 } | |
440 | |
441 js = gc->proto_data; | |
434 | 442 |
435 if(js->state == JABBER_STREAM_CONNECTING) | 443 if(js->state == JABBER_STREAM_CONNECTING) |
436 jabber_send_raw(js, "<?xml version='1.0' ?>", -1); | 444 jabber_send_raw(js, "<?xml version='1.0' ?>", -1); |
437 jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING); | 445 jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING); |
438 gaim_ssl_input_add(gsc, jabber_recv_cb_ssl, gc); | 446 gaim_ssl_input_add(gsc, jabber_recv_cb_ssl, gc); |