comparison libpurple/protocols/msn/slp.c @ 19843:60bc06498746

Committing khc's msnp14 changes from Trac Ticket #148. --rlaager committer: Richard Laager <rlaager@wiktel.com>
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 15 Apr 2007 04:12:27 +0000
parents 32c366eeeb99
children 1122d47583a1
comparison
equal deleted inserted replaced
16121:6167ee79ecd0 19843:60bc06498746
31 #include "user.h" 31 #include "user.h"
32 #include "switchboard.h" 32 #include "switchboard.h"
33 33
34 /* ms to delay between sending buddy icon requests to the server. */ 34 /* ms to delay between sending buddy icon requests to the server. */
35 #define BUDDY_ICON_DELAY 20000 35 #define BUDDY_ICON_DELAY 20000
36 /*debug SLP*/
37 #define MSN_DEBUG_UD
36 38
37 static void send_ok(MsnSlpCall *slpcall, const char *branch, 39 static void send_ok(MsnSlpCall *slpcall, const char *branch,
38 const char *type, const char *content); 40 const char *type, const char *content);
39 41
40 static void send_decline(MsnSlpCall *slpcall, const char *branch, 42 static void send_decline(MsnSlpCall *slpcall, const char *branch,
749 * I didn't want to do this, but MSN 7 is somehow causing us to crash 751 * I didn't want to do this, but MSN 7 is somehow causing us to crash
750 * here, I couldn't reproduce it to debug more, and people are 752 * here, I couldn't reproduce it to debug more, and people are
751 * reporting bugs. Hopefully this doesn't cause more crashes. Stu. 753 * reporting bugs. Hopefully this doesn't cause more crashes. Stu.
752 */ 754 */
753 if (slplink->swboard != NULL) 755 if (slplink->swboard != NULL)
754 slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink); 756 slplink->swboard->slplink = slplink;
755 else 757 else
756 purple_debug_error("msn", "msn_p2p_msg, swboard is NULL, ouch!\n"); 758 purple_debug_error("msn", "msn_p2p_msg, swboard is NULL, ouch!\n");
757 } 759 }
758 760
759 msn_slplink_process_msg(slplink, msg); 761 msn_slplink_process_msg(slplink, msg);
769 const char *who; 771 const char *who;
770 772
771 gc = slpcall->slplink->session->account->gc; 773 gc = slpcall->slplink->session->account->gc;
772 who = slpcall->slplink->remote_user; 774 who = slpcall->slplink->remote_user;
773 775
774 if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, gc->account))) { 776 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, gc->account);
775 777
776 /* FIXME: it would be better if we wrote the data as we received it 778 /* FIXME: it would be better if we wrote the data as we received it
777 instead of all at once, calling write multiple times and 779 instead of all at once, calling write multiple times and
778 close once at the very end 780 close once at the very end
779 */ 781 */
780 purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size); 782 purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
781 purple_conv_custom_smiley_close(conv, slpcall->data_info); 783 purple_conv_custom_smiley_close(conv, slpcall->data_info );
782 }
783 #ifdef MSN_DEBUG_UD 784 #ifdef MSN_DEBUG_UD
784 purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info); 785 purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
785 #endif 786 #endif
786 } 787 }
787 788