Mercurial > pidgin.yaz
comparison src/protocols/msn/switchboard.c @ 10621:fe919915fceb
[gaim-migrate @ 12090]
This should fix the MSN problems with having multiple
switchboards associated with the same conversation / buddy.
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Tue, 22 Feb 2005 15:16:38 +0000 |
parents | f0fd35985cb0 |
children | c4cb90065e1d |
comparison
equal
deleted
inserted
replaced
10620:17daac7cea91 | 10621:fe919915fceb |
---|---|
852 gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT)) | 852 gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT)) |
853 { | 853 { |
854 serv_got_chat_in(gc, swboard->chat_id, passport, 0, body_final, | 854 serv_got_chat_in(gc, swboard->chat_id, passport, 0, body_final, |
855 time(NULL)); | 855 time(NULL)); |
856 if (swboard->conv == NULL) | 856 if (swboard->conv == NULL) |
857 { | |
858 swboard->conv = gaim_find_chat(gc, swboard->chat_id); | 857 swboard->conv = gaim_find_chat(gc, swboard->chat_id); |
859 swboard->flag |= MSN_SB_FLAG_IM; | |
860 } | |
861 } | 858 } |
862 else | 859 else |
863 { | 860 { |
864 serv_got_im(gc, passport, body_final, 0, time(NULL)); | 861 serv_got_im(gc, passport, body_final, 0, time(NULL)); |
865 if (swboard->conv == NULL) | 862 if (swboard->conv == NULL) |
866 { | |
867 swboard->conv = gaim_find_conversation_with_account(GAIM_CONV_IM, | 863 swboard->conv = gaim_find_conversation_with_account(GAIM_CONV_IM, |
868 passport, gaim_connection_get_account(gc)); | 864 passport, gaim_connection_get_account(gc)); |
869 swboard->flag |= MSN_SB_FLAG_IM; | |
870 } | |
871 } | 865 } |
872 | 866 |
873 g_free(body_final); | 867 g_free(body_final); |
874 } | 868 } |
875 | 869 |