Mercurial > pidgin

comparison libpurple/protocols/msn/switchboard.c @ 32533:e091c8ea292e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pluck all MSNP18 changes. This is pretty much to fix sending OIMs. *** Plucked rev b8b574c4d6f6c05105b372191ca5259b4ae0ad41 (qulogic@pidgin.im): Add a function for parsing a network:username for MSNP18. *** Plucked rev 86bb401efa33f02ca5d28fea216a39a3cf29b5b4 (qulogic@pidgin.im): Fix UBX on MSNP18. *** Plucked rev ba2513694e6abcbdfddc66820f1df20540a36847 (qulogic@pidgin.im): Fix NLN on MSNP18. *** Plucked rev 83a617670da618f4dbdeeebbdb5e2813a4ad2c0c (qulogic@pidgin.im): Switch to ABFindContactsPaged instead of ABFindAll. *** Plucked rev b6bd214d29db885c6d28628c163fa144bdf4a76d (qulogic@pidgin.im): Send circle authentication on the notification server on MSNP18. *** Plucked rev 2ca50146aa67469313579cea414e4a2b660939aa (qulogic@pidgin.im): Make a small name change. *** Plucked rev 2c13bf358104060d6713317e18e03b434862cb38 (qulogic@pidgin.im): Add a missing function. *** Plucked rev a8deb3f73726f4148e8f36f317a88fedcb051c34 (qulogic@pidgin.im): Update UUM to allow sending to users on any network. *** Plucked rev dddff988e830a7a2fa0e40aad200f0e908b9231e (qulogic@pidgin.im): Switch to MSNP18. *** Plucked rev 9fe45819000c530c509c07b7feb29ce9d4ea13b0 (qulogic@pidgin.im): Send offline messages using UUM. *** Plucked rev c1584182b85f99fa3507ea3f76b07865ee7e43f7 (qulogic@pidgin.im): Drop support for protocols below 18. *** Plucked rev f0388e54998489dbe4b6133796f77459f20fe884 (qulogic@pidgin.im): Fix indices for client capabilities and display pics.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 22 Feb 2012 05:52:30 +0000
parents 22cb8c11bba8
children e10e419e6067
comparison
equal deleted inserted replaced
32532:2851202488e9 32533:e091c8ea292e
705 705
706 static void 706 static void
707 ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) 707 ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
708 { 708 {
709 purple_debug_misc("msn", "get UBM...\n"); 709 purple_debug_misc("msn", "get UBM...\n");
710 if (cmdproc->session->protocol_ver >= 16) 710 cmd->payload_len = atoi(cmd->params[5]);
711 cmd->payload_len = atoi(cmd->params[5]);
712 else
713 cmd->payload_len = atoi(cmd->params[3]);
714 cmdproc->last_cmd->payload_cb = msg_cmd_post; 711 cmdproc->last_cmd->payload_cb = msg_cmd_post;
715 } 712 }
716 713
717 static void 714 static void
718 nak_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) 715 nak_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
865 862
866 account = cmdproc->session->account; 863 account = cmdproc->session->account;
867 swboard = cmdproc->data; 864 swboard = cmdproc->data;
868 g_return_if_fail(swboard != NULL); 865 g_return_if_fail(swboard != NULL);
869 866
870 if (servconn->session->protocol_ver >= 16) 867 username = g_strdup_printf("%s;{%s}",
871 username = g_strdup_printf("%s;{%s}", 868 purple_account_get_username(account),
872 purple_account_get_username(account), 869 servconn->session->guid);
873 servconn->session->guid);
874 else
875 username = g_strdup(purple_account_get_username(account));
876 870
877 if (msn_switchboard_is_invited(swboard)) 871 if (msn_switchboard_is_invited(swboard))
878 { 872 {
879 swboard->empty = FALSE; 873 swboard->empty = FALSE;
880 874