Mercurial > pidgin
comparison libpurple/protocols/oscar/flap_connection.c @ 22195:6419554aadd9
merge of '7a2d6f31a70791d5e6e8af6fae041e30d5a1c48f'
and 'a0479b7ebd8713b6442fb2ecb8238b7e71be61b5'
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Fri, 25 Jan 2008 00:51:06 +0000 |
parents | ce5ced43cd93 252b96b6a32c |
children | 3225c99785b8 |
comparison
equal
deleted
inserted
replaced
22194:17e21fa1db57 | 22195:6419554aadd9 |
---|---|
815 /* Error! */ | 815 /* Error! */ |
816 flap_connection_schedule_destroy(conn, | 816 flap_connection_schedule_destroy(conn, |
817 OSCAR_DISCONNECT_LOST_CONNECTION, g_strerror(errno)); | 817 OSCAR_DISCONNECT_LOST_CONNECTION, g_strerror(errno)); |
818 break; | 818 break; |
819 } | 819 } |
820 conn->od->gc->last_received = time(NULL); | |
820 | 821 |
821 /* If we don't even have a complete FLAP header then do nothing */ | 822 /* If we don't even have a complete FLAP header then do nothing */ |
822 conn->header_received += read; | 823 conn->header_received += read; |
823 if (conn->header_received < 6) | 824 if (conn->header_received < 6) |
824 break; | 825 break; |