diff options
author | kenobi <kenobi@rhea> | 2007-12-19 00:59:35 +0100 |
---|---|---|
committer | kenobi <kenobi@rhea> | 2007-12-19 00:59:35 +0100 |
commit | eded1f703a8f5d2272b9d294d8e3dfb48fa302b4 (patch) | |
tree | 9f372f50d123a258640c91a6dc3c027d9c8df4aa /protocols/jabber/io.c | |
parent | dc0ba9c85539533349353713162f94077fb27be3 (diff) |
Merged in 280..288 from upstream (e.g. PING)
Diffstat (limited to 'protocols/jabber/io.c')
-rw-r--r-- | protocols/jabber/io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/jabber/io.c b/protocols/jabber/io.c index 61cd142e..29561b86 100644 --- a/protocols/jabber/io.c +++ b/protocols/jabber/io.c @@ -119,7 +119,7 @@ static gboolean jabber_write_queue( struct im_connection *ic ) return TRUE; } - else if( st == 0 || ( st < 0 && !sockerr_again() ) ) + else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) ) { /* Set fd to -1 to make sure we won't write to it anymore. */ closesocket( jd->fd ); /* Shouldn't be necessary after errors? */ @@ -230,7 +230,7 @@ static gboolean jabber_read_callback( gpointer data, gint fd, b_input_condition } } } - else if( st == 0 || ( st < 0 && !sockerr_again() ) ) + else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) ) { closesocket( jd->fd ); jd->fd = -1; |