comparison libpurple/protocols/msn/slp.c @ 20412:522f618a44b4

propagate from branch 'im.pidgin.pidgin' (head 3f8c9725bb938821f3ef6cb2e7c6c31d7b662d0b) to branch 'im.pidgin.cpw.khc.msnp14' (head 7e655675a82d008f4ea9743aeb2ed141837bc1ec)
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 12 May 2007 19:19:55 +0000
parents 21830d70709b 522ade544156
children 0f6747c5dcc2
comparison
equal deleted inserted replaced
17072:cb4380df3005 20412:522f618a44b4
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,
750 * I didn't want to do this, but MSN 7 is somehow causing us to crash 752 * I didn't want to do this, but MSN 7 is somehow causing us to crash
751 * here, I couldn't reproduce it to debug more, and people are 753 * here, I couldn't reproduce it to debug more, and people are
752 * reporting bugs. Hopefully this doesn't cause more crashes. Stu. 754 * reporting bugs. Hopefully this doesn't cause more crashes. Stu.
753 */ 755 */
754 if (slplink->swboard != NULL) 756 if (slplink->swboard != NULL)
755 slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink); 757 slplink->swboard->slplink = slplink;
756 else 758 else
757 purple_debug_error("msn", "msn_p2p_msg, swboard is NULL, ouch!\n"); 759 purple_debug_error("msn", "msn_p2p_msg, swboard is NULL, ouch!\n");
758 } 760 }
759 761
760 msn_slplink_process_msg(slplink, msg); 762 msn_slplink_process_msg(slplink, msg);
770 const char *who; 772 const char *who;
771 773
772 gc = slpcall->slplink->session->account->gc; 774 gc = slpcall->slplink->session->account->gc;
773 who = slpcall->slplink->remote_user; 775 who = slpcall->slplink->remote_user;
774 776
775 if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, gc->account))) { 777 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, gc->account);
776 778
777 /* FIXME: it would be better if we wrote the data as we received it 779 /* FIXME: it would be better if we wrote the data as we received it
778 instead of all at once, calling write multiple times and 780 instead of all at once, calling write multiple times and
779 close once at the very end 781 close once at the very end
780 */ 782 */
781 purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size); 783 purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
782 purple_conv_custom_smiley_close(conv, slpcall->data_info); 784 purple_conv_custom_smiley_close(conv, slpcall->data_info );
783 }
784 #ifdef MSN_DEBUG_UD 785 #ifdef MSN_DEBUG_UD
785 purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info); 786 purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
786 #endif 787 #endif
787 } 788 }
788 789