Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
21219:5f829728a1a5 | 21220:b1fa7765ca4b |
---|---|
962 imdata->gc = gc; | 962 imdata->gc = gc; |
963 imdata->who = who; | 963 imdata->who = who; |
964 imdata->msg = body_str; | 964 imdata->msg = body_str; |
965 imdata->flags = flags; | 965 imdata->flags = flags; |
966 imdata->when = time(NULL); | 966 imdata->when = time(NULL); |
967 g_idle_add(msn_send_me_im, imdata); | 967 purple_timeout_add(0, msn_send_me_im, imdata); |
968 } | 968 } |
969 | 969 |
970 msn_message_destroy(msg); | 970 msn_message_destroy(msg); |
971 }else { | 971 }else { |
972 /*send Offline Instant Message,only to MSN Passport User*/ | 972 /*send Offline Instant Message,only to MSN Passport User*/ |
1122 | 1122 |
1123 session = gc->proto_data; | 1123 session = gc->proto_data; |
1124 userlist = session->userlist; | 1124 userlist = session->userlist; |
1125 who = msn_normalize(gc->account, buddy->name); | 1125 who = msn_normalize(gc->account, buddy->name); |
1126 | 1126 |
1127 purple_debug_info("MSN","Add user:%s to group:%s\n", who, group->name); | 1127 purple_debug_info("MSN","Add user:%s to group:%s\n", who, (group && group->name) ? group->name : "(null)"); |
1128 if (!session->logged_in) | 1128 if (!session->logged_in) |
1129 { | 1129 { |
1130 #if 0 | 1130 #if 0 |
1131 fake_userlist_add_buddy(session->sync_userlist, who, MSN_LIST_FL, | 1131 fake_userlist_add_buddy(session->sync_userlist, who, MSN_LIST_FL, |
1132 group ? group->name : NULL); | 1132 group ? group->name : NULL); |
2004 g_free(tmp); | 2004 g_free(tmp); |
2005 | 2005 |
2006 #if PHOTO_SUPPORT | 2006 #if PHOTO_SUPPORT |
2007 /* Find the URL to the photo; must be before the marshalling [Bug 994207] */ | 2007 /* Find the URL to the photo; must be before the marshalling [Bug 994207] */ |
2008 photo_url_text = msn_get_photo_url(url_text); | 2008 photo_url_text = msn_get_photo_url(url_text); |
2009 purple_debug_info("MSNP14","photo url:{%s}\n",photo_url_text); | 2009 purple_debug_info("MSNP14","photo url:{%s}\n", photo_url_text ? photo_url_text : "(null)"); |
2010 | 2010 |
2011 /* Marshall the existing state */ | 2011 /* Marshall the existing state */ |
2012 info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData)); | 2012 info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData)); |
2013 info2_data->info_data = info_data; | 2013 info2_data->info_data = info_data; |
2014 info2_data->stripped = stripped; | 2014 info2_data->stripped = stripped; |