comparison: src/protocols/msn/msn.c
src/protocols/msn/msn.c
- changeset 8298
- eb6f1096ffa6
- parent 8291
- da3beaff4d75
- child 8333
- 09d55969e801
equal
deleted
inserted
replaced
| 8297:ffb119b42cc7 | 8298:eb6f1096ffa6 |
|---|---|
| 269 swboard->total_users = 1; | 269 swboard->total_users = 1; |
| 270 | 270 |
| 271 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id, "MSN Chat"); | 271 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id, "MSN Chat"); |
| 272 | 272 |
| 273 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->chat), | 273 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->chat), |
| 274 gaim_account_get_username(account), NULL); | 274 gaim_account_get_username(account), NULL); |
| 275 } | 275 } |
| 276 | 276 |
| 277 /************************************************************************** | 277 /************************************************************************** |
| 278 * Protocol Plugin ops | 278 * Protocol Plugin ops |
| 279 **************************************************************************/ | 279 **************************************************************************/ |
| 476 | 476 |
| 477 session = msn_session_new(account, server, port); | 477 session = msn_session_new(account, server, port); |
| 478 session->http_method = http_method; | 478 session->http_method = http_method; |
| 479 session->prpl = my_protocol; | 479 session->prpl = my_protocol; |
| 480 | 480 |
| 481 if (session->http_method) | |
| 482 msn_http_session_init(session); | |
| 483 | |
| 481 gc->proto_data = session; | 484 gc->proto_data = session; |
| 482 | 485 |
| 483 gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS); | 486 gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS); |
| 484 | 487 |
| 485 /* Hmm, I don't like this. */ | 488 /* Hmm, I don't like this. */ |
| 497 | 500 |
| 498 static void | 501 static void |
| 499 msn_close(GaimConnection *gc) | 502 msn_close(GaimConnection *gc) |
| 500 { | 503 { |
| 501 MsnSession *session = gc->proto_data; | 504 MsnSession *session = gc->proto_data; |
| 505 | |
| 506 if (session->http_method) | |
| 507 msn_http_session_uninit(session); | |
| 502 | 508 |
| 503 msn_session_destroy(session); | 509 msn_session_destroy(session); |
| 504 | 510 |
| 505 gc->proto_data = NULL; | 511 gc->proto_data = NULL; |
| 506 } | 512 } |
| 1665 | 1671 |
| 1666 option = gaim_account_option_int_new(_("Port"), "port", 1863); | 1672 option = gaim_account_option_int_new(_("Port"), "port", 1863); |
| 1667 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, | 1673 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
| 1668 option); | 1674 option); |
| 1669 | 1675 |
| 1670 #if 0 | |
| 1671 option = gaim_account_option_bool_new(_("Use HTTP Method"), "http_method", | 1676 option = gaim_account_option_bool_new(_("Use HTTP Method"), "http_method", |
| 1672 FALSE); | 1677 FALSE); |
| 1673 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, | 1678 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
| 1674 option); | 1679 option); |
| 1675 #endif | |
| 1676 | 1680 |
| 1677 my_protocol = plugin; | 1681 my_protocol = plugin; |
| 1678 | 1682 |
| 1679 gaim_prefs_add_none("/plugins/prpl/msn"); | 1683 gaim_prefs_add_none("/plugins/prpl/msn"); |
| 1680 gaim_prefs_add_bool("/plugins/prpl/msn/conv_close_notice", TRUE); | 1684 gaim_prefs_add_bool("/plugins/prpl/msn/conv_close_notice", TRUE); |
