comparison libpurple/protocols/msn/notification.c @ 22798:05cb3f04c01e

This cleans up a bunch of warnings that stem from the fact that size_t and gsize have different sizes on different platforms.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sat, 03 May 2008 02:12:26 +0000
parents 1168dc635ac1
children f62a4a7fe365
comparison
equal deleted inserted replaced
22796:5e6b42e77fb7 22798:05cb3f04c01e
412 } 412 }
413 else 413 else
414 { 414 {
415 g_return_if_fail(cmd->payload_cb != NULL); 415 g_return_if_fail(cmd->payload_cb != NULL);
416 416
417 purple_debug_info("MSNP14","MSG payload:{%.*s}\n",cmd->payload_len, cmd->payload); 417 purple_debug_info("MSNP14", "MSG payload:{%.*s}\n", (guint)(cmd->payload_len), cmd->payload);
418 cmd->payload_cb(cmdproc, cmd, cmd->payload, cmd->payload_len); 418 cmd->payload_cb(cmdproc, cmd, cmd->payload, cmd->payload_len);
419 } 419 }
420 } 420 }
421 421
422 /*send Message to Yahoo Messenger*/ 422 /*send Message to Yahoo Messenger*/
430 int type; 430 int type;
431 431
432 cmdproc = session->notification->cmdproc; 432 cmdproc = session->notification->cmdproc;
433 g_return_if_fail(msg != NULL); 433 g_return_if_fail(msg != NULL);
434 payload = msn_message_gen_payload(msg, &payload_len); 434 payload = msn_message_gen_payload(msg, &payload_len);
435 purple_debug_info("MSNP14","send UUM,payload{%s},strlen:%d,len:%d\n", 435 purple_debug_info("MSNP14",
436 payload,strlen(payload),payload_len); 436 "send UUM, payload{%s}, strlen:%" G_GSIZE_FORMAT ", len:%" G_GSIZE_FORMAT "\n",
437 payload, strlen(payload), payload_len);
437 type = msg->type; 438 type = msg->type;
438 trans = msn_transaction_new(cmdproc, "UUM","%s 32 %d %d",msg->remote_user,type,payload_len); 439 trans = msn_transaction_new(cmdproc, "UUM", "%s 32 %d %" G_GSIZE_FORMAT,
440 msg->remote_user, type, payload_len);
439 msn_transaction_set_payload(trans, payload, strlen(payload)); 441 msn_transaction_set_payload(trans, payload, strlen(payload));
440 msn_cmdproc_send_trans(cmdproc, trans); 442 msn_cmdproc_send_trans(cmdproc, trans);
441 } 443 }
442 444
443 static void 445 static void
447 MsnMessage *msg; 449 MsnMessage *msg;
448 PurpleConnection *gc; 450 PurpleConnection *gc;
449 const char *passport; 451 const char *passport;
450 const char *content_type; 452 const char *content_type;
451 453
452 purple_debug_info("MSNP14","Process UBM payload:%.*s\n", len, payload); 454 purple_debug_info("MSNP14","Process UBM payload:%.*s\n", (guint)len, payload);
453 msg = msn_message_new_from_cmd(cmdproc->session, cmd); 455 msg = msn_message_new_from_cmd(cmdproc->session, cmd);
454 456
455 msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM); 457 msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM);
456 #ifdef MSN_DEBUG_NS 458 #ifdef MSN_DEBUG_NS
457 msn_message_show_readable(msg, "Notification", TRUE); 459 msn_message_show_readable(msg, "Notification", TRUE);
528 cmdproc->last_cmd->payload_cb = ubm_cmd_post; 530 cmdproc->last_cmd->payload_cb = ubm_cmd_post;
529 cmdproc->servconn->payload_len = atoi(cmd->params[2]); 531 cmdproc->servconn->payload_len = atoi(cmd->params[2]);
530 }else{ 532 }else{
531 g_return_if_fail(cmd->payload_cb != NULL); 533 g_return_if_fail(cmd->payload_cb != NULL);
532 534
533 purple_debug_info("MSNP14","UBM payload:{%.*s}\n", cmd->payload_len, cmd->payload); 535 purple_debug_info("MSNP14", "UBM payload:{%.*s}\n", (guint)(cmd->payload_len), cmd->payload);
534 ubm_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len); 536 ubm_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len);
535 } 537 }
536 } 538 }
537 539
538 /************************************************************************** 540 /**************************************************************************
643 static void 645 static void
644 msn_notification_post_adl(MsnCmdProc *cmdproc, const char *payload, int payload_len) 646 msn_notification_post_adl(MsnCmdProc *cmdproc, const char *payload, int payload_len)
645 { 647 {
646 MsnTransaction *trans; 648 MsnTransaction *trans;
647 purple_debug_info("MSN Notification","Sending ADL with payload: %s\n", payload); 649 purple_debug_info("MSN Notification","Sending ADL with payload: %s\n", payload);
648 trans = msn_transaction_new(cmdproc, "ADL","%d", strlen(payload)); 650 trans = msn_transaction_new(cmdproc, "ADL","%" G_GSIZE_FORMAT, strlen(payload));
649 msn_transaction_set_payload(trans, payload, strlen(payload)); 651 msn_transaction_set_payload(trans, payload, strlen(payload));
650 msn_cmdproc_send_trans(cmdproc, trans); 652 msn_cmdproc_send_trans(cmdproc, trans);
651 } 653 }
652 654
653 /*dump contact info to NS*/ 655 /*dump contact info to NS*/
727 tokens = g_strsplit(passport, "@", 2); 729 tokens = g_strsplit(passport, "@", 2);
728 email = tokens[0]; 730 email = tokens[0];
729 domain = tokens[1]; 731 domain = tokens[1];
730 732
731 payload = g_strdup_printf("<ml><d n=\"%s\"><c n=\"%s\"/></d></ml>", domain, email); 733 payload = g_strdup_printf("<ml><d n=\"%s\"><c n=\"%s\"/></d></ml>", domain, email);
732 trans = msn_transaction_new(cmdproc, "FQY","%d", strlen(payload)); 734 trans = msn_transaction_new(cmdproc, "FQY","%" G_GSIZE_FORMAT, strlen(payload));
733 msn_transaction_set_payload(trans, payload, strlen(payload)); 735 msn_transaction_set_payload(trans, payload, strlen(payload));
734 msn_cmdproc_send_trans(cmdproc, trans); 736 msn_cmdproc_send_trans(cmdproc, trans);
735 737
736 g_free(payload); 738 g_free(payload);
737 g_strfreev(tokens); 739 g_strfreev(tokens);
2068 2070
2069 payload = xmlnode_to_str(rml_node, &payload_len); 2071 payload = xmlnode_to_str(rml_node, &payload_len);
2070 xmlnode_free(rml_node); 2072 xmlnode_free(rml_node);
2071 2073
2072 purple_debug_info("MSN Notification","Send RML with payload:\n%s\n", payload); 2074 purple_debug_info("MSN Notification","Send RML with payload:\n%s\n", payload);
2073 trans = msn_transaction_new(cmdproc, "RML","%d", strlen(payload)); 2075 trans = msn_transaction_new(cmdproc, "RML","%" G_GSIZE_FORMAT, strlen(payload));
2074 msn_transaction_set_payload(trans, payload, strlen(payload)); 2076 msn_transaction_set_payload(trans, payload, strlen(payload));
2075 msn_cmdproc_send_trans(cmdproc, trans); 2077 msn_cmdproc_send_trans(cmdproc, trans);
2076 g_free(payload); 2078 g_free(payload);
2077 } 2079 }
2078 2080