Mercurial > pidgin.yaz

comparison src/protocols/msn/msn.c @ 10463:9bed28273ec7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
10462:f7b32dd67bdf 10463:9bed28273ec7
619 { 619 {
620 act = gaim_blist_node_action_new(_("Send to Mobile"), 620 act = gaim_blist_node_action_new(_("Send to Mobile"),
621 show_send_to_mobile_cb, NULL); 621 show_send_to_mobile_cb, NULL);
622 m = g_list_append(m, act); 622 m = g_list_append(m, act);
623 } 623 }
624
625 } 624 }
626 625
627 if (g_ascii_strcasecmp(buddy->name, 626 if (g_ascii_strcasecmp(buddy->name,
628 gaim_account_get_username(buddy->account))) 627 gaim_account_get_username(buddy->account)))
629 { 628 {
630 act = gaim_blist_node_action_new(_("Initiate Chat"), 629 act = gaim_blist_node_action_new(_("Initiate _Chat"),
631 initiate_chat_cb, NULL); 630 initiate_chat_cb, NULL);
632 m = g_list_append(m, act); 631 m = g_list_append(m, act);
633 } 632 }
634 633
635 return m; 634 return m;
669 668
670 return; 669 return;
671 } 670 }
672 671
673 if (gaim_account_get_bool(account, "http_method", FALSE)) 672 if (gaim_account_get_bool(account, "http_method", FALSE))
674 {
675 http_method = TRUE; 673 http_method = TRUE;
676 674
677 gaim_debug_info("msn", "using http method\n"); 675 host = gaim_account_get_string(account, "server", MSN_SERVER);
678 676 port = gaim_account_get_int(account, "port", MSN_PORT);
679 host = "gateway.messenger.hotmail.com";
680 port = 80;
681 }
682 else
683 {
684 host = gaim_account_get_string(account, "server", MSN_SERVER);
685 port = gaim_account_get_int(account, "port", MSN_PORT);
686 }
687 677
688 session = msn_session_new(account, host, port, http_method); 678 session = msn_session_new(account, host, port, http_method);
689
690 if (session->http_method)
691 msn_http_session_init(session);
692 679
693 gc->proto_data = session; 680 gc->proto_data = session;
694 gc->flags |= GAIM_CONNECTION_HTML | GAIM_CONNECTION_FORMATTING_WBFO | GAIM_CONNECTION_NO_BGCOLOR | GAIM_CONNECTION_NO_FONTSIZE | GAIM_CONNECTION_NO_URLDESC; 681 gc->flags |= GAIM_CONNECTION_HTML | GAIM_CONNECTION_FORMATTING_WBFO | GAIM_CONNECTION_NO_BGCOLOR | GAIM_CONNECTION_NO_FONTSIZE | GAIM_CONNECTION_NO_URLDESC;
695 682
696 gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS); 683 gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS);
710 MsnSession *session; 697 MsnSession *session;
711 698
712 session = gc->proto_data; 699 session = gc->proto_data;
713 700
714 g_return_if_fail(session != NULL); 701 g_return_if_fail(session != NULL);
715
716 if (session->http_method)
717 msn_http_session_uninit(session);
718 702
719 msn_session_destroy(session); 703 msn_session_destroy(session);
720 704
721 gc->proto_data = NULL; 705 gc->proto_data = NULL;
722 } 706 }
1863 msn_rem_deny, /* rem_deny */ 1847 msn_rem_deny, /* rem_deny */
1864 msn_set_permit_deny, /* set_permit_deny */ 1848 msn_set_permit_deny, /* set_permit_deny */
1865 NULL, /* warn */ 1849 NULL, /* warn */
1866 NULL, /* join_chat */ 1850 NULL, /* join_chat */
1867 NULL, /* reject chat invite */ 1851 NULL, /* reject chat invite */
1868 NULL, /* get_chat_name */ 1852 NULL, /* get_chat_name */
1869 msn_chat_invite, /* chat_invite */ 1853 msn_chat_invite, /* chat_invite */
1870 msn_chat_leave, /* chat_leave */ 1854 msn_chat_leave, /* chat_leave */
1871 NULL, /* chat_whisper */ 1855 NULL, /* chat_whisper */
1872 msn_chat_send, /* chat_send */ 1856 msn_chat_send, /* chat_send */
1873 msn_keepalive, /* keepalive */ 1857 msn_keepalive, /* keepalive */