Mercurial > pidgin.yaz
changeset 23547:03ade2360ba6
Remove some MSN code duplication in processing messages from Yahoo
buddies and fix a typo, I think. I don't have any Yahoo buddies to test
this, though.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 23 Jun 2008 00:54:05 +0000 |
| parents | 455a8264e06e |
| children | 165546763e3a |
| files | libpurple/protocols/msn/notification.c |
| diffstat | 1 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Sun Jun 22 23:44:12 2008 +0000 +++ b/libpurple/protocols/msn/notification.c Mon Jun 23 00:54:05 2008 +0000 @@ -360,7 +360,7 @@ msg = msn_message_new_from_cmd(cmdproc->session, cmd); - msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM); + msn_message_parse_payload(msg, payload, len, MSG_LINE_DEM, MSG_BODY_DEM); #ifdef MSN_DEBUG_NS msn_message_show_readable(msg, "Notification", TRUE); #endif @@ -374,18 +374,16 @@ msg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) { purple_debug_info("MSNP14","Processing MSG... \n"); - if(cmd->payload_len == 0){ + if (cmd->payload_len == 0) { return; } /* NOTE: cmd is not always cmdproc->last_cmd, sometimes cmd is a queued * command and we are processing it */ - if (cmd->payload == NULL) - { + if (cmd->payload == NULL) { cmdproc->last_cmd->payload_cb = msg_cmd_post; cmdproc->servconn->payload_len = atoi(cmd->params[2]); - } - else - { + + } else { g_return_if_fail(cmd->payload_cb != NULL); #if 0 /* glib on win32 doesn't correctly support precision modifiers for a string */ @@ -418,6 +416,7 @@ msn_cmdproc_send_trans(cmdproc, trans); } +#if 0 static void ubm_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len) @@ -491,25 +490,26 @@ } msn_message_destroy(msg); } +#endif /*Yahoo msg process*/ static void ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) { purple_debug_info("MSNP14","Processing UBM... \n"); - if(cmd->payload_len == 0){ + if (cmd->payload_len == 0) { return; } /* NOTE: cmd is not always cmdproc->last_cmd, sometimes cmd is a queued * command and we are processing it */ - if (cmd->payload == NULL){ - cmdproc->last_cmd->payload_cb = ubm_cmd_post; - cmdproc->servconn->payload_len = atoi(cmd->params[2]); - }else{ + if (cmd->payload == NULL ){ + cmdproc->last_cmd->payload_cb = msg_cmd_post; + cmdproc->servconn->payload_len = atoi(cmd->params[4]); + } else { g_return_if_fail(cmd->payload_cb != NULL); purple_debug_info("MSNP14", "UBM payload:{%.*s}\n", (guint)(cmd->payload_len), cmd->payload); - ubm_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len); + msg_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len); } }