Mercurial > pidgin.yaz
diff libpurple/protocols/msn/msn.c @ 21220:b1fa7765ca4b
propagate from branch 'im.pidgin.pidgin' (head d42511319051bcfa8adb3ed8e3f11a26cabc43f4)
to branch 'next.minor' (head 3526bc084159c5c57e580e9e9e190b6ff502fdbe)
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 12 Oct 2007 02:18:35 +0000 |
| parents | 5f829728a1a5 306f3c0bccd4 |
| children | 0b67d509a305 fa3c4c5dea66 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Fri Oct 12 02:06:38 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Fri Oct 12 02:18:35 2007 +0000 @@ -964,7 +964,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); @@ -1124,7 +1124,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 @@ -2006,7 +2006,7 @@ #if PHOTO_SUPPORT /* Find the URL to the photo; must be before the marshalling [Bug 994207] */ photo_url_text = msn_get_photo_url(url_text); - purple_debug_info("MSNP14","photo url:{%s}\n",photo_url_text); + purple_debug_info("MSNP14","photo url:{%s}\n", photo_url_text ? photo_url_text : "(null)"); /* Marshall the existing state */ info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData));