Mercurial > pidgin
comparison libpurple/protocols/msn/msg.c @ 30737:1ba9f3167de0
propagate from branch 'im.pidgin.cpw.qulogic.msnp16' (head 6f45ed65a9417053e242214f5c2bc51028f8e01f)
to branch 'im.pidgin.soc.2010.msn-tlc' (head a95c8c315e1110ef7d9ee619ddf3ab101bf7fa08)
| author | masca@cpw.pidgin.im |
|---|---|
| date | Wed, 26 May 2010 20:01:05 +0000 |
| parents | 66e7fe9f7810 7fa07adbe482 |
| children | a99b6dcdb60d |
comparison
equal
deleted
inserted
replaced
| 30736:2bc54dfae627 | 30737:1ba9f3167de0 |
|---|---|
| 881 { | 881 { |
| 882 swboard->conv = purple_find_chat(gc, swboard->chat_id); | 882 swboard->conv = purple_find_chat(gc, swboard->chat_id); |
| 883 swboard->flag |= MSN_SB_FLAG_IM; | 883 swboard->flag |= MSN_SB_FLAG_IM; |
| 884 } | 884 } |
| 885 } | 885 } |
| 886 else | 886 else if (!g_str_equal(passport, purple_account_get_username(gc->account))) |
| 887 { | 887 { |
| 888 /* Don't im ourselves ... */ | |
| 888 serv_got_im(gc, passport, body_final, 0, time(NULL)); | 889 serv_got_im(gc, passport, body_final, 0, time(NULL)); |
| 889 if (swboard->conv == NULL) | 890 if (swboard->conv == NULL) |
| 890 { | 891 { |
| 891 swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, | 892 swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, |
| 892 passport, purple_connection_get_account(gc)); | 893 passport, purple_connection_get_account(gc)); |