Changeset bd5eee3 for protocols/oscar

Timestamp:

2010-05-09T09:48:56Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e5abfd4

Parents:

75610c3 (diff), 5a599a1 (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:

Merging mainline, mostly for chatroom fixes I implemented there.

File:

• protocols/oscar/oscar.c (modified) (1 diff)

protocols/oscar/oscar.c

@@ -2659 +2659 @@
         
         c = imcb_chat_new(ic, chatname);
-
         ret = oscar_chat_join(ic, chatname, NULL, NULL);
-
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);