comparison src/protocols/msn/msn.c @ 8595:1d5e31e518fc

[gaim-migrate @ 9346] This brings back MSN formatting support, for now at least. Tim is working on a patch to make per-message formatting (for MSN and other protocols that decided to be crappy in design) a reality, so this should let him test it out. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Tue, 06 Apr 2004 05:41:12 +0000
parents f96795b786d2
children 1e211dde3cae
comparison
equal deleted inserted replaced
8594:f3b928825a72 8595:1d5e31e518fc
485 485
486 if (session->http_method) 486 if (session->http_method)
487 msn_http_session_init(session); 487 msn_http_session_init(session);
488 488
489 gc->proto_data = session; 489 gc->proto_data = session;
490 gc->flags |= GAIM_CONNECTION_HTML;
490 491
491 gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS); 492 gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS);
492 493
493 /* Hmm, I don't like this. */ 494 /* Hmm, I don't like this. */
494 username = msn_normalize(account, gaim_account_get_username(account)); 495 username = msn_normalize(account, gaim_account_get_username(account));
530 swboard = msn_session_find_switch_with_passport(session, who); 531 swboard = msn_session_find_switch_with_passport(session, who);
531 532
532 if (g_ascii_strcasecmp(who, gaim_account_get_username(account))) { 533 if (g_ascii_strcasecmp(who, gaim_account_get_username(account))) {
533 MsnMessage *msg; 534 MsnMessage *msg;
534 MsnUser *user; 535 MsnUser *user;
535 /*char *msgformat;*/ 536 char *msgformat;
536 537 char *msgtext;
538
537 user = msn_user_new(session, who, NULL); 539 user = msn_user_new(session, who, NULL);
540
541 msn_import_html(message, &msgformat, &msgtext);
538 542
539 msg = msn_message_new(); 543 msg = msn_message_new();
540 msn_message_set_receiver(msg, user); 544 msn_message_set_receiver(msg, user);
541 /*msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);*/ 545 msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
542 msn_message_set_body(msg, message); 546 msn_message_set_body(msg, msgtext);
543 547
544 /*g_free(msgformat);*/ 548 g_free(msgformat);
549 g_free(msgtext);
545 550
546 if (swboard != NULL) { 551 if (swboard != NULL) {
547 if (!msn_switchboard_send_msg(swboard, msg)) 552 if (!msn_switchboard_send_msg(swboard, msg))
548 msn_switchboard_destroy(swboard); 553 msn_switchboard_destroy(swboard);
549 } 554 }