comparison src/protocols/msn/switchboard.c @ 19791:bddd32f36bde

[gaim-migrate @ 16653] a version can show the windows Live ID's Info correctly ready to send the oim,need to check committed by Ma Yuan<[e-mail]> committer: Ethan Blanton <[e-mail]>

19790:4f21c73a0c48

#include "switchboard.h"
#include "notification.h"
#include "msn-utils.h"

#include "error.h"

static MsnTable *cbs_table;

static void msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg,
							 MsnMsgErrorType error);

						 gboolean queue)
{
	g_return_if_fail(swboard != NULL);
	g_return_if_fail(msg     != NULL);

	if (msn_switchboard_can_send(swboard))
		release_msg(swboard, msg);
	else if (queue)
		queue_msg(swboard, msg);
}

static void
cal_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
{
	int reason = MSN_SB_ERROR_UNKNOWN;

	if (error == 215)
	{
		gaim_debug_info("msn", "Invited user already in switchboard\n");
		return;

	{
		reason = MSN_SB_ERROR_USER_OFFLINE;
	}

	gaim_debug_warning("msn", "cal_error: command %s gave error %i\n", trans->command, error);

	cal_error_helper(trans, reason);
}

void
msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user)

19791:bddd32f36bde

#include "switchboard.h"
#include "notification.h"
#include "msn-utils.h"

#include "error.h"

#define MSN_DEBUG_SB

static MsnTable *cbs_table;

static void msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg,
							 MsnMsgErrorType error);

						 gboolean queue)
{
	g_return_if_fail(swboard != NULL);
	g_return_if_fail(msg     != NULL);

	gaim_debug_info("Ma Yuan","switchboard send msg..\n");
	if (msn_switchboard_can_send(swboard))
		release_msg(swboard, msg);
	else if (queue)
		queue_msg(swboard, msg);
}

static void
cal_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
{
	int reason = MSN_SB_ERROR_UNKNOWN;
	MsnMessage *msg;
	MsnSwitchBoard *swboard = trans->data;

	if (error == 215)
	{
		gaim_debug_info("msn", "Invited user already in switchboard\n");
		return;

	{
		reason = MSN_SB_ERROR_USER_OFFLINE;
	}

	gaim_debug_warning("msn", "cal_error: command %s gave error %i\n", trans->command, error);
	gaim_debug_warning("msn", "Will Use Offline Message to sendit\n");

//	cal_error_helper(trans, reason);
	/*offline Message send Process*/

	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL){
		gaim_debug_warning("Ma Yuan","offline msg to send:{%s}\n",msg->body);
		/* The messages could not be sent due to a switchboard error */
		swboard->error = MSN_SB_ERROR_USER_OFFLINE;
		msg_error_helper(swboard->cmdproc, msg,
							 MSN_MSG_ERROR_SB);
		msn_message_unref(msg);
	}
	cal_error_helper(trans, reason);
}

void
msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user)