comparison src/protocols/msn/switchboard.c @ 6827:1cfbb731aa1f

[gaim-migrate @ 7372] Several fixes for attempted NULL pointer frees, and some MSNSLP fixes. Still not ready for use yet. committer: Tailor Script <[e-mail]>

6826:2adf21e70601

	msn_message_set_content_type(msg, "text/x-clientcaps");
	msn_message_set_charset(msg, NULL);
	msn_message_set_attr(msg, "User-Agent", NULL);
	msn_message_set_body(msg, MSN_CLIENTINFO);

	if (!msn_switchboard_send_msg(swboard, msg)) {
		gaim_debug_warning("msn",
						   "Unable to send clientcaps. "
						   "Disconnecting from switchboard.\n");
		msn_switchboard_destroy(swboard);

	MsnSwitchBoard *swboard = servconn->data;
	MsnSession *session = servconn->session;

	send_clientcaps(swboard);

#if 0
	if (session->protocol_ver >= 9)
	{
		MsnUser *local_user, *remote_user;

		remote_user = msn_user_new(session,
				msn_user_get_passport(msn_switchboard_get_user(swboard)),

		msn_slp_session_request_user_display(swboard->slp_session,
											 local_user, remote_user,
											 msn_user_get_object(remote_user));
	}
#endif

	return TRUE;
}

static gboolean

msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
{
	char *buf;
	size_t len;
	int ret;

	g_return_val_if_fail(swboard != NULL, FALSE);
	g_return_val_if_fail(msg     != NULL, FALSE);

	msn_message_set_transaction_id(msg, ++swboard->trId);

		return TRUE;
	}

	ret = msn_servconn_write(swboard->servconn, buf, len);

	g_free(buf);

	return (ret > 0);
}

6827:1cfbb731aa1f

	msn_message_set_content_type(msg, "text/x-clientcaps");
	msn_message_set_charset(msg, NULL);
	msn_message_set_attr(msg, "User-Agent", NULL);
	msn_message_set_body(msg, MSN_CLIENTINFO);

	if (!msn_switchboard_send_msg(swboard, msg))
	{
		gaim_debug_warning("msn",
						   "Unable to send clientcaps. "
						   "Disconnecting from switchboard.\n");
		msn_switchboard_destroy(swboard);

	MsnSwitchBoard *swboard = servconn->data;
	MsnSession *session = servconn->session;

	send_clientcaps(swboard);

	if (0 && session->protocol_ver >= 9)
	{
		MsnUser *local_user, *remote_user;

		remote_user = msn_user_new(session,
				msn_user_get_passport(msn_switchboard_get_user(swboard)),

		msn_slp_session_request_user_display(swboard->slp_session,
											 local_user, remote_user,
											 msn_user_get_object(remote_user));
	}

	return TRUE;
}

static gboolean

msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
{
	char *buf;
	size_t len;
	int ret;
	FILE *fp;

	g_return_val_if_fail(swboard != NULL, FALSE);
	g_return_val_if_fail(msg     != NULL, FALSE);

	msn_message_set_transaction_id(msg, ++swboard->trId);

		return TRUE;
	}

	ret = msn_servconn_write(swboard->servconn, buf, len);

	fp = fopen("/tmp/msn-msg", "wb");
	fwrite(buf, 1, len, fp);
	fclose(fp);

	g_free(buf);

	return (ret > 0);
}