comparison 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
comparison
equal deleted inserted replaced
11337:1462b64f8fc9 11338:17142948653e
765 const char *who; 765 const char *who;
766 766
767 gc = slpcall->slplink->session->account->gc; 767 gc = slpcall->slplink->session->account->gc;
768 who = slpcall->slplink->remote_user; 768 who = slpcall->slplink->remote_user;
769 769
770 conv = gaim_find_conversation_with_account(GAIM_CONV_ANY, who, gc->account); 770 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, gc->account);
771 771
772 /* FIXME: it would be better if we wrote the data as we received it 772 /* FIXME: it would be better if we wrote the data as we received it
773 instead of all at once, calling write multiple times and 773 instead of all at once, calling write multiple times and
774 close once at the very end 774 close once at the very end
775 */ 775 */
811 811
812 slplink = msn_session_get_slplink(session, who); 812 slplink = msn_session_get_slplink(session, who);
813 813
814 gc = slplink->session->account->gc; 814 gc = slplink->session->account->gc;
815 815
816 conversation = gaim_find_conversation_with_account(GAIM_CONV_ANY, who, gc->account); 816 conversation = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, gc->account);
817 817
818 if (gaim_conv_custom_smiley_add(conversation, smile, "sha1", sha1c)) { 818 if (gaim_conv_custom_smiley_add(conversation, smile, "sha1", sha1c)) {
819 msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj); 819 msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);
820 } 820 }
821 821