comparison src/protocols/msn/msg.c @ 10092:1843023b8189

[gaim-migrate @ 11109] This fixes the crash after signon on MSN when you have Miranda users on your buddy list. I also tidied up the printing of SLP debug info when it's enabled, but it's not enabled unless you explicitly enable it, so you probably won't notice. committer: Tailor Script <[e-mail]>

10091:4e376556566e

	body = msn_message_get_bin_data(msg, &body_len);

	if (msg->msnslp_message)
	{
		g_string_append_printf(str, "%u ", msg->msnslp_header.session_id);
		g_string_append_printf(str, "%u ", msg->msnslp_header.id);
		g_string_append_printf(str, "%llu ", msg->msnslp_header.offset);
		g_string_append(str, "\r\n");
		g_string_append_printf(str, "%llu ",
							   msg->msnslp_header.total_size);
		g_string_append_printf(str, "%u ", msg->msnslp_header.length);
		g_string_append_printf(str, "%u ", msg->msnslp_header.flags);
		g_string_append(str, "\r\n");
		g_string_append_printf(str, "%u ", msg->msnslp_header.ack_id);
		g_string_append_printf(str, "%u ", msg->msnslp_header.ack_sub_id);
		g_string_append_printf(str, "%lld ", msg->msnslp_header.ack_size);
		g_string_append(str, "\r\n");

		if (body != NULL)
		{
			if (text_body)
			{
				g_string_append_len(str, body, body_len);

						g_string_append(str, "\r\n");
				}
				g_string_append(str, "\r\n");
			}
		}

		g_string_append_printf(str, "%u ", msg->msnslp_footer.value);
		g_string_append(str, "\r\n");
	}
	else
	{
		if (body != NULL)
		{

10092:1843023b8189

	body = msn_message_get_bin_data(msg, &body_len);

	if (msg->msnslp_message)
	{
		g_string_append_printf(str, "Session ID: %u\r\n", msg->msnslp_header.session_id);
		g_string_append_printf(str, "ID:         %u\r\n", msg->msnslp_header.id);
		g_string_append_printf(str, "Offset:     %llu\r\n", msg->msnslp_header.offset);
		g_string_append_printf(str, "Total size: %llu\r\n", msg->msnslp_header.total_size);
		g_string_append_printf(str, "Length:     %u\r\n", msg->msnslp_header.length);
		g_string_append_printf(str, "Flags:      0x%x\r\n", msg->msnslp_header.flags);
		g_string_append_printf(str, "ACK ID:     %u\r\n", msg->msnslp_header.ack_id);
		g_string_append_printf(str, "SUB ID:     %u\r\n", msg->msnslp_header.ack_sub_id);
		g_string_append_printf(str, "ACK Size:   %lld\r\n", msg->msnslp_header.ack_size);

#ifdef DEBUG_SLP_VERBOSE
		if (body != NULL)
		{
			if (text_body)
			{
				g_string_append_len(str, body, body_len);

						g_string_append(str, "\r\n");
				}
				g_string_append(str, "\r\n");
			}
		}
#endif

		g_string_append_printf(str, "Footer:     %u\r\n", msg->msnslp_footer.value);
	}
	else
	{
		if (body != NULL)
		{