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/conn.c | |
| parent | cf136714caa13e2cd4bf8a69a29c08f3a1518f59 (diff) | |
| parent | b20b32f0785f9a1eff448382a98e64812469e112 (diff) | |
Merge from Wilmer
Diffstat (limited to 'protocols/oscar/conn.c')
| -rw-r--r-- | protocols/oscar/conn.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/protocols/oscar/conn.c b/protocols/oscar/conn.c index 711e3458..0155e5bc 100644 --- a/protocols/oscar/conn.c +++ b/protocols/oscar/conn.c @@ -163,9 +163,7 @@ static void connkill_real(aim_session_t *sess, aim_conn_t **deadconn) /* * This will free ->internal if it necessary... */ - if ((*deadconn)->type == AIM_CONN_TYPE_RENDEZVOUS) - aim_conn_kill_rend(sess, *deadconn); - else if ((*deadconn)->type == AIM_CONN_TYPE_CHAT) + if ((*deadconn)->type == AIM_CONN_TYPE_CHAT) aim_conn_kill_chat(sess, *deadconn); if ((*deadconn)->inside) { @@ -313,8 +311,6 @@ void aim_conn_close(aim_conn_t *deadconn) deadconn->fd = -1; if (deadconn->handlerlist) aim_clearhandlers(deadconn); - if (deadconn->type == AIM_CONN_TYPE_RENDEZVOUS) - aim_conn_close_rend((aim_session_t *)deadconn->sessv, deadconn); return; } |