comparison libpurple/protocols/msn/msn.c @ 27758:4426e530c156

propagate from branch 'im.pidgin.pidgin' (head d6936cb019234c5f9985eceac8678731c6b7bf25) to branch 'im.pidgin.pidgin.yaz' (head bc5b850d928a6335925869de1135ab510801ea03)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 08 Jan 2008 19:23:50 +0000
parents 9a60b9fab0ea 23fef20a0ef2
children e9cf897bd873
comparison
equal deleted inserted replaced
27757:a8529c3dafe4 27758:4426e530c156
478 swboard = msn_switchboard_new(session); 478 swboard = msn_switchboard_new(session);
479 msn_switchboard_request(swboard); 479 msn_switchboard_request(swboard);
480 msn_switchboard_request_add_user(swboard, buddy->name); 480 msn_switchboard_request_add_user(swboard, buddy->name);
481 481
482 /* TODO: This might move somewhere else, after USR might be */ 482 /* TODO: This might move somewhere else, after USR might be */
483 swboard->chat_id = session->conv_seq++; 483 swboard->chat_id = msn_switchboard_get_chat_id();
484 swboard->conv = serv_got_joined_chat(gc, swboard->chat_id, "MSN Chat"); 484 swboard->conv = serv_got_joined_chat(gc, swboard->chat_id, "MSN Chat");
485 swboard->flag = MSN_SB_FLAG_IM; 485 swboard->flag = MSN_SB_FLAG_IM;
486 486
487 purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), 487 purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv),
488 purple_account_get_username(buddy->account), NULL, PURPLE_CBFLAGS_NONE, TRUE); 488 purple_account_get_username(buddy->account), NULL, PURPLE_CBFLAGS_NONE, TRUE);