Mercurial > pidgin.yaz
diff src/protocols/msn/slp.c @ 11338:17142948653e
[gaim-migrate @ 13551]
Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM
and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined
two oscar header files (one of them was small and dorky).
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 25 Aug 2005 02:33:44 +0000 |
| parents | fd6d96ef5c6d |
| children | 922782381027 |
line wrap: on
line diff
--- a/src/protocols/msn/slp.c Thu Aug 25 00:27:12 2005 +0000 +++ b/src/protocols/msn/slp.c Thu Aug 25 02:33:44 2005 +0000 @@ -767,7 +767,7 @@ gc = slpcall->slplink->session->account->gc; who = slpcall->slplink->remote_user; - conv = gaim_find_conversation_with_account(GAIM_CONV_ANY, who, gc->account); + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, gc->account); /* FIXME: it would be better if we wrote the data as we received it instead of all at once, calling write multiple times and @@ -813,7 +813,7 @@ gc = slplink->session->account->gc; - conversation = gaim_find_conversation_with_account(GAIM_CONV_ANY, who, gc->account); + conversation = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, gc->account); if (gaim_conv_custom_smiley_add(conversation, smile, "sha1", sha1c)) { msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);