Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/msn.c @ 20892:bbcc9e206c43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
20823:f33ed41b6dee 20892:bbcc9e206c43
941 imdata->gc = gc; 941 imdata->gc = gc;
942 imdata->who = who; 942 imdata->who = who;
943 imdata->msg = body_str; 943 imdata->msg = body_str;
944 imdata->flags = flags; 944 imdata->flags = flags;
945 imdata->when = time(NULL); 945 imdata->when = time(NULL);
946 g_idle_add(msn_send_me_im, imdata); 946 purple_timeout_add(0, msn_send_me_im, imdata);
947 } 947 }
948 948
949 msn_message_destroy(msg); 949 msn_message_destroy(msg);
950 }else { 950 }else {
951 /*send Offline Instant Message,only to MSN Passport User*/ 951 /*send Offline Instant Message,only to MSN Passport User*/
1101 1101
1102 session = gc->proto_data; 1102 session = gc->proto_data;
1103 userlist = session->userlist; 1103 userlist = session->userlist;
1104 who = msn_normalize(gc->account, buddy->name); 1104 who = msn_normalize(gc->account, buddy->name);
1105 1105
1106 purple_debug_info("MSN","Add user:%s to group:%s\n", who, group->name); 1106 purple_debug_info("MSN","Add user:%s to group:%s\n", who, (group && group->name) ? group->name : "(null)");
1107 if (!session->logged_in) 1107 if (!session->logged_in)
1108 { 1108 {
1109 #if 0 1109 #if 0
1110 fake_userlist_add_buddy(session->sync_userlist, who, MSN_LIST_FL, 1110 fake_userlist_add_buddy(session->sync_userlist, who, MSN_LIST_FL,
1111 group ? group->name : NULL); 1111 group ? group->name : NULL);