Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/notification.c @ 21220:b1fa7765ca4b
propagate from branch 'im.pidgin.pidgin' (head d42511319051bcfa8adb3ed8e3f11a26cabc43f4)
to branch 'next.minor' (head 3526bc084159c5c57e580e9e9e190b6ff502fdbe)
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Fri, 12 Oct 2007 02:18:35 +0000 |
parents | 5f829728a1a5 a3be7b2e335c |
children | 6de09629f091 |
comparison
equal
deleted
inserted
replaced
21219:5f829728a1a5 | 21220:b1fa7765ca4b |
---|---|
228 static void | 228 static void |
229 usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | 229 usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
230 { | 230 { |
231 MsnSession *session; | 231 MsnSession *session; |
232 PurpleAccount *account; | 232 PurpleAccount *account; |
233 PurpleConnection *gc; | |
234 | 233 |
235 session = cmdproc->session; | 234 session = cmdproc->session; |
236 account = session->account; | 235 account = session->account; |
237 gc = purple_account_get_connection(account); | |
238 | 236 |
239 if (!g_ascii_strcasecmp(cmd->params[1], "OK")) | 237 if (!g_ascii_strcasecmp(cmd->params[1], "OK")) |
240 { | 238 { |
241 /* authenticate OK */ | 239 /* authenticate OK */ |
242 /* friendly name part no longer true in msnp11 */ | 240 /* friendly name part no longer true in msnp11 */ |
448 MsnMessage *msg; | 446 MsnMessage *msg; |
449 PurpleConnection *gc; | 447 PurpleConnection *gc; |
450 const char *passport; | 448 const char *passport; |
451 const char *content_type; | 449 const char *content_type; |
452 | 450 |
453 purple_debug_info("MSNP14","Process UBM payload:%s\n",payload); | 451 purple_debug_info("MSNP14","Process UBM payload:%.*s\n", len, payload); |
454 msg = msn_message_new_from_cmd(cmdproc->session, cmd); | 452 msg = msn_message_new_from_cmd(cmdproc->session, cmd); |
455 | 453 |
456 msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM); | 454 msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM); |
457 #ifdef MSN_DEBUG_NS | 455 #ifdef MSN_DEBUG_NS |
458 msn_message_show_readable(msg, "Notification", TRUE); | 456 msn_message_show_readable(msg, "Notification", TRUE); |
531 cmdproc->last_cmd->payload_cb = ubm_cmd_post; | 529 cmdproc->last_cmd->payload_cb = ubm_cmd_post; |
532 cmdproc->servconn->payload_len = atoi(cmd->params[2]); | 530 cmdproc->servconn->payload_len = atoi(cmd->params[2]); |
533 }else{ | 531 }else{ |
534 g_return_if_fail(cmd->payload_cb != NULL); | 532 g_return_if_fail(cmd->payload_cb != NULL); |
535 | 533 |
536 purple_debug_info("MSNP14","UBM payload:{%s}\n",cmd->payload); | 534 purple_debug_info("MSNP14","UBM payload:{%.*s}\n", cmd->payload_len, cmd->payload); |
537 ubm_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len); | 535 ubm_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len); |
538 } | 536 } |
539 } | 537 } |
540 | 538 |
541 /************************************************************************** | 539 /************************************************************************** |
1200 static void | 1198 static void |
1201 prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | 1199 prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
1202 { | 1200 { |
1203 MsnSession *session = cmdproc->session; | 1201 MsnSession *session = cmdproc->session; |
1204 const char *type, *value, *friendlyname; | 1202 const char *type, *value, *friendlyname; |
1205 | |
1206 purple_debug_info("MSN Notification", "prp_cmd()\n"); | |
1207 | 1203 |
1208 g_return_if_fail(cmd->param_count >= 3); | 1204 g_return_if_fail(cmd->param_count >= 3); |
1209 | 1205 |
1210 type = cmd->params[2]; | 1206 type = cmd->params[2]; |
1211 | 1207 |
1616 ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, | 1612 ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, |
1617 size_t len) | 1613 size_t len) |
1618 { | 1614 { |
1619 MsnSession *session; | 1615 MsnSession *session; |
1620 PurpleAccount *account; | 1616 PurpleAccount *account; |
1621 PurpleConnection *gc; | |
1622 MsnUser *user; | 1617 MsnUser *user; |
1623 const char *passport; | 1618 const char *passport; |
1624 char *psm_str, *str; | 1619 char *psm_str, *str; |
1625 CurrentMedia media = {NULL, NULL, NULL}; | 1620 CurrentMedia media = {NULL, NULL, NULL}; |
1626 | 1621 |
1627 session = cmdproc->session; | 1622 session = cmdproc->session; |
1628 account = session->account; | 1623 account = session->account; |
1629 gc = purple_account_get_connection(account); | |
1630 | 1624 |
1631 passport = cmd->params[0]; | 1625 passport = cmd->params[0]; |
1632 user = msn_userlist_find_user(session->userlist, passport); | 1626 user = msn_userlist_find_user(session->userlist, passport); |
1633 | 1627 |
1634 psm_str = msn_get_psm(cmd->payload,len); | 1628 psm_str = msn_get_psm(cmd->payload,len); |