diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-05-09 10:48:56 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-05-09 10:48:56 +0100 |
| commit | bd5eee34fd1495820fb8440d515cbc86e8d912b2 (patch) | |
| tree | a2893dfdce80c818c9b1c34a320b8f45e064cd82 /protocols/oscar | |
| parent | 75610c3b53a68451d9eaf40fdc8a5e6419a13339 (diff) | |
| parent | 5a599a1550c670649dba681e702864d55d2e3795 (diff) | |
Merging mainline, mostly for chatroom fixes I implemented there.
Diffstat (limited to 'protocols/oscar')
| -rw-r--r-- | protocols/oscar/oscar.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index de594eee..2d07f912 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -2658,9 +2658,7 @@ struct groupchat *oscar_chat_with(struct im_connection * ic, char *who) ic->acc->user, chat_id++); 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); g_free(chatname); |