Changeset cfcc587 for protocols/oscar/rxqueue.c

Timestamp:

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

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

ed165fe

Parents:

cf13671 (diff), b20b32f (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/rxqueue.c (modified) (2 diffs)

protocols/oscar/rxqueue.c

@@ -332 +332 @@
         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 +358 @@
         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));