Changeset b20b32f for protocols/oscar/conn.c

Timestamp:

2005-11-28T01:14:06Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

65e2ce1, cfcc587

Parents:

2cdd8ce (diff), dfde8e0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from Wilmer

File:

• protocols/oscar/conn.c (modified) (2 diffs)

protocols/oscar/conn.c

@@ -164 +164 @@
          * 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);
 
@@ -314 +312 @@
         if (deadconn->handlerlist)
                 aim_clearhandlers(deadconn);
-        if (deadconn->type == AIM_CONN_TYPE_RENDEZVOUS)
-                aim_conn_close_rend((aim_session_t *)deadconn->sessv, deadconn);
 
         return;