Mercurial > pidgin.yaz
changeset 13449:90d0a473e7ff
[gaim-migrate @ 15824]
Patch 1444667 - fix for bug 1444653, from sadrul, and a small tweak by me.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Tue, 07 Mar 2006 10:25:55 +0000 |
| parents | 4b8dcf7c38a2 |
| children | 5251e354d213 |
| files | src/protocols/msn/switchboard.c |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/msn/switchboard.c Tue Mar 07 10:11:13 2006 +0000 +++ b/src/protocols/msn/switchboard.c Tue Mar 07 10:25:55 2006 +0000 @@ -292,8 +292,7 @@ } else if (swboard->conv == NULL) { - /* XXX - I think this should probably be GAIM_CONV_TYPE_CHAT, but I'm hedging */ - swboard->conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, + swboard->conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, user, account); } else @@ -316,9 +315,8 @@ account = swboard->session->account; - /* XXX - I think this should probably be GAIM_CONV_TYPE_IM, but I'm hedging */ - return gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, - swboard->im_user, account); + return (swboard->conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, + account, swboard->im_user)); } static void