Mercurial > pidgin
comparison libpurple/protocols/msn/switchboard.c @ 32819:2c6510167895 default tip
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24)
to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 02 Jun 2012 02:30:49 +0000 |
| parents | e10e419e6067 |
| children |
comparison
equal
deleted
inserted
replaced
| 32818:01ff09d4a463 | 32819:2c6510167895 |
|---|---|
| 310 purple_conversation_destroy(swboard->conv); | 310 purple_conversation_destroy(swboard->conv); |
| 311 #endif | 311 #endif |
| 312 | 312 |
| 313 swboard->chat_id = msn_switchboard_get_chat_id(); | 313 swboard->chat_id = msn_switchboard_get_chat_id(); |
| 314 swboard->flag |= MSN_SB_FLAG_IM; | 314 swboard->flag |= MSN_SB_FLAG_IM; |
| 315 swboard->conv = serv_got_joined_chat(account->gc, | 315 swboard->conv = serv_got_joined_chat(purple_account_get_connection(account), |
| 316 swboard->chat_id, | 316 swboard->chat_id, |
| 317 "MSN Chat"); | 317 "MSN Chat"); |
| 318 | 318 |
| 319 for (l = swboard->users; l != NULL; l = l->next) | 319 for (l = swboard->users; l != NULL; l = l->next) |
| 320 { | 320 { |
| 745 out_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | 745 out_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
| 746 { | 746 { |
| 747 PurpleConnection *gc; | 747 PurpleConnection *gc; |
| 748 MsnSwitchBoard *swboard; | 748 MsnSwitchBoard *swboard; |
| 749 | 749 |
| 750 gc = cmdproc->session->account->gc; | 750 gc = purple_account_get_connection(cmdproc->session->account); |
| 751 swboard = cmdproc->data; | 751 swboard = cmdproc->data; |
| 752 | 752 |
| 753 if (swboard->current_users > 1) | 753 if (swboard->current_users > 1) |
| 754 serv_got_chat_left(gc, swboard->chat_id); | 754 serv_got_chat_left(gc, swboard->chat_id); |
| 755 | 755 |