Changeset 6e9ae72 for protocols/oscar/chat.c

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

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

protocols/oscar/chat.c

@@ -384 +384 @@
         char *roomname = NULL;
         struct aim_chat_roominfo roominfo;
-        guint16 tlvcount = 0;
         aim_tlvlist_t *tlvlist;
         char *roomdesc = NULL;
@@ -401 +400 @@
         }
 
-        tlvcount = aimbs_get16(bs);
+        aimbs_get16(bs); /* tlv count */
 
         /*