diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-11-28 02:14:35 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-11-28 02:14:35 +0100 |
| commit | cfcc5877b737800ab84cd67d9c413e7254ac1f50 (patch) | |
| tree | b4302a38f8a7a90c0328b2a15f947f06c7c8266f /protocols/oscar/rxqueue.c | |
| parent | cf136714caa13e2cd4bf8a69a29c08f3a1518f59 (diff) | |
| parent | b20b32f0785f9a1eff448382a98e64812469e112 (diff) | |
Merge from Wilmer
Diffstat (limited to 'protocols/oscar/rxqueue.c')
| -rw-r--r-- | protocols/oscar/rxqueue.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/protocols/oscar/rxqueue.c b/protocols/oscar/rxqueue.c index d95bc026..d8adaa73 100644 --- a/protocols/oscar/rxqueue.c +++ b/protocols/oscar/rxqueue.c @@ -331,11 +331,7 @@ void aim_frame_destroy(aim_frame_t *frame) g_free(frame->data.data); /* XXX aim_bstream_free */ - if (frame->hdrtype == AIM_FRAMETYPE_OFT) - g_free(frame->hdr.oft.hdr2); g_free(frame); - - return; } @@ -362,17 +358,6 @@ int aim_get_command(aim_session_t *sess, aim_conn_t *conn) if (conn->status & AIM_CONN_STATUS_INPROGRESS) return aim_conn_completeconnect(sess, conn); - /* - * Rendezvous (client-client) connections do not speak - * FLAP, so this function will break on them. - */ - if (conn->type == AIM_CONN_TYPE_RENDEZVOUS) - return aim_get_command_rendezvous(sess, conn); - else if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) { - do_error_dialog(sess->aux_data,"AIM_CONN_TYPE_RENDEZVOUS_OUT shouldn't use FLAP", "Gaim"); - return 0; - } - aim_bstream_init(&flaphdr, flaphdr_raw, sizeof(flaphdr_raw)); /* |