Mercurial > pidgin.yaz
diff src/protocols/msn/msn.c @ 10463:9bed28273ec7
[gaim-migrate @ 11737]
Felipe Contreras fixed the MSN HTTP Method. Yay! Thanks Felipe.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 31 Dec 2004 16:34:22 +0000 |
| parents | 92d4a25fd33c |
| children | bcfea6c3d5c9 |
line wrap: on
line diff
--- a/src/protocols/msn/msn.c Fri Dec 31 15:34:18 2004 +0000 +++ b/src/protocols/msn/msn.c Fri Dec 31 16:34:22 2004 +0000 @@ -621,13 +621,12 @@ show_send_to_mobile_cb, NULL); m = g_list_append(m, act); } - } if (g_ascii_strcasecmp(buddy->name, gaim_account_get_username(buddy->account))) { - act = gaim_blist_node_action_new(_("Initiate Chat"), + act = gaim_blist_node_action_new(_("Initiate _Chat"), initiate_chat_cb, NULL); m = g_list_append(m, act); } @@ -671,25 +670,13 @@ } if (gaim_account_get_bool(account, "http_method", FALSE)) - { http_method = TRUE; - gaim_debug_info("msn", "using http method\n"); - - host = "gateway.messenger.hotmail.com"; - port = 80; - } - else - { - host = gaim_account_get_string(account, "server", MSN_SERVER); - port = gaim_account_get_int(account, "port", MSN_PORT); - } + host = gaim_account_get_string(account, "server", MSN_SERVER); + port = gaim_account_get_int(account, "port", MSN_PORT); session = msn_session_new(account, host, port, http_method); - if (session->http_method) - msn_http_session_init(session); - gc->proto_data = session; gc->flags |= GAIM_CONNECTION_HTML | GAIM_CONNECTION_FORMATTING_WBFO | GAIM_CONNECTION_NO_BGCOLOR | GAIM_CONNECTION_NO_FONTSIZE | GAIM_CONNECTION_NO_URLDESC; @@ -713,9 +700,6 @@ g_return_if_fail(session != NULL); - if (session->http_method) - msn_http_session_uninit(session); - msn_session_destroy(session); gc->proto_data = NULL; @@ -1865,7 +1849,7 @@ NULL, /* warn */ NULL, /* join_chat */ NULL, /* reject chat invite */ - NULL, /* get_chat_name */ + NULL, /* get_chat_name */ msn_chat_invite, /* chat_invite */ msn_chat_leave, /* chat_leave */ NULL, /* chat_whisper */