Mercurial > pidgin.yaz
diff libpurple/protocols/msn/msn.c @ 20892:bbcc9e206c43
propagate from branch 'im.pidgin.pidgin' (head f33ba0034c79d8e37a70d664ec534356fa361608)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head b3c8182bd741b961775afed0768fbecdc47dc828)
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Fri, 12 Oct 2007 00:19:12 +0000 |
| parents | efa448405f3d 306f3c0bccd4 |
| children | fa3c4c5dea66 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Thu Oct 11 23:55:13 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Fri Oct 12 00:19:12 2007 +0000 @@ -943,7 +943,7 @@ imdata->msg = body_str; imdata->flags = flags; imdata->when = time(NULL); - g_idle_add(msn_send_me_im, imdata); + purple_timeout_add(0, msn_send_me_im, imdata); } msn_message_destroy(msg); @@ -1103,7 +1103,7 @@ userlist = session->userlist; who = msn_normalize(gc->account, buddy->name); - purple_debug_info("MSN","Add user:%s to group:%s\n", who, group->name); + purple_debug_info("MSN","Add user:%s to group:%s\n", who, (group && group->name) ? group->name : "(null)"); if (!session->logged_in) { #if 0