Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/msg.c @ 32827:4a34689eeb33 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged from im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 19 Nov 2011 14:42:54 +0900
parents 0f94ec89f0bc 2ec94166be43
children
comparison
equal deleted inserted replaced
32692:0f94ec89f0bc 32827:4a34689eeb33
630 char *yaz_body_final; 630 char *yaz_body_final;
631 size_t body_len, new_len; 631 size_t body_len, new_len;
632 const char *passport; 632 const char *passport;
633 const char *value; 633 const char *value;
634 634
635 gc = cmdproc->session->account->gc; 635 gc = purple_account_get_connection(cmdproc->session->account);
636 636
637 body = msn_message_get_bin_data(msg, &body_len); 637 body = msn_message_get_bin_data(msg, &body_len);
638 body_str = sanitize_utf(body, body_len, &new_len); 638 body_str = sanitize_utf(body, body_len, &new_len);
639 body_enc = g_markup_escape_text(body_str, -1); 639 body_enc = g_markup_escape_text(body_str, -1);
640 g_free(body_str); 640 g_free(body_str);
700 { 700 {
701 swboard->conv = purple_find_chat(gc, swboard->chat_id); 701 swboard->conv = purple_find_chat(gc, swboard->chat_id);
702 swboard->flag |= MSN_SB_FLAG_IM; 702 swboard->flag |= MSN_SB_FLAG_IM;
703 } 703 }
704 } 704 }
705 else if (!g_str_equal(passport, purple_account_get_username(gc->account))) 705 else if (!g_str_equal(passport, purple_account_get_username(purple_connection_get_account(gc))))
706 { 706 {
707 /* Don't im ourselves ... */ 707 /* Don't im ourselves ... */
708 serv_got_im(gc, passport, body_final, 0, time(NULL)); 708 serv_got_im(gc, passport, body_final, 0, time(NULL));
709 if (swboard->conv == NULL) 709 if (swboard->conv == NULL)
710 { 710 {
725 msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg) 725 msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
726 { 726 {
727 PurpleConnection *gc; 727 PurpleConnection *gc;
728 char *passport; 728 char *passport;
729 729
730 gc = cmdproc->session->account->gc; 730 gc = purple_account_get_connection(cmdproc->session->account);
731 passport = msg->remote_user; 731 passport = msg->remote_user;
732 732
733 if (msn_message_get_header_value(msg, "TypingUser") == NULL) 733 if (msn_message_get_header_value(msg, "TypingUser") == NULL)
734 return; 734 return;
735 735
774 else 774 else
775 chat = FALSE; 775 chat = FALSE;
776 776
777 if (swboard->conv == NULL) { 777 if (swboard->conv == NULL) {
778 if (chat) 778 if (chat)
779 swboard->conv = purple_find_chat(account->gc, swboard->chat_id); 779 swboard->conv = purple_find_chat(purple_account_get_connection(account), swboard->chat_id);
780 else { 780 else {
781 swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, 781 swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
782 who, account); 782 who, account);
783 if (swboard->conv == NULL) 783 if (swboard->conv == NULL)
784 swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who); 784 swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
1003 1003
1004 if (!strcmp(id, "1")) { 1004 if (!strcmp(id, "1")) {
1005 /* Nudge */ 1005 /* Nudge */
1006 PurpleAccount *account; 1006 PurpleAccount *account;
1007 const char *user; 1007 const char *user;
1008 PurpleConnection *gc;
1008 1009
1009 account = cmdproc->session->account; 1010 account = cmdproc->session->account;
1010 user = msg->remote_user; 1011 user = msg->remote_user;
1012 gc = purple_account_get_connection(account);
1011 1013
1012 if (cmdproc->servconn->type == MSN_SERVCONN_SB) { 1014 if (cmdproc->servconn->type == MSN_SERVCONN_SB) {
1013 MsnSwitchBoard *swboard = cmdproc->data; 1015 MsnSwitchBoard *swboard = cmdproc->data;
1014 if (swboard->current_users > 1 || 1016 if (swboard->current_users > 1 ||
1015 ((swboard->conv != NULL) && 1017 ((swboard->conv != NULL) &&
1016 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) 1018 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
1017 purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); 1019 purple_prpl_got_attention_in_chat(gc, swboard->chat_id, user, MSN_NUDGE);
1018 1020
1019 else 1021 else
1020 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); 1022 purple_prpl_got_attention(gc, user, MSN_NUDGE);
1021 } else { 1023 } else {
1022 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); 1024 purple_prpl_got_attention(gc, user, MSN_NUDGE);
1023 } 1025 }
1024 1026
1025 } else if (!strcmp(id, "2")) { 1027 } else if (!strcmp(id, "2")) {
1026 /* Wink */ 1028 /* Wink */
1027 MsnSession *session; 1029 MsnSession *session;