Changeset bd69a21 for protocols/oscar/aim.h

Timestamp:

2005-12-15T12:24:25Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

4146a07

Parents:

2983f5e (diff), bf02a67 (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 Wilmer

File:

• protocols/oscar/aim.h (modified) (2 diffs)

protocols/oscar/aim.h

@@ -466 +466 @@
 int aim_addtlvtochain_caps(aim_tlvlist_t **list, const guint16 t, const guint32 caps);
 int aim_addtlvtochain_noval(aim_tlvlist_t **list, const guint16 type);
+int aim_addtlvtochain_chatroom(aim_tlvlist_t **list, guint16 type, guint16 exchange, const char *roomname, guint16 instance);
 int aim_addtlvtochain_userinfo(aim_tlvlist_t **list, guint16 type, aim_userinfo_t *ui);
 int aim_addtlvtochain_frozentlvlist(aim_tlvlist_t **list, guint16 type, aim_tlvlist_t **tl);
@@ -572 +573 @@
 };
 
+struct aim_chat_invitation {
+        struct gaim_connection * gc;
+        char * name;
+        guint8 exchange;
+};
 
 #define AIM_VISIBILITYCHANGE_PERMITADD    0x05