comparison libpurple/protocols/msn/msn.c @ 23519:7bceac816e19

The great MSN debug message cleanup! Threw in a few whitespace fixes, too, as I saw them. Nothing to see here, move along...

23518:186af522f14d

	MsnMessage *msg;
	char *msgformat;
	char *msgtext;
	const char *username;

	purple_debug_info("MSNP14","send IM {%s} to %s\n",message,who);
	account = purple_connection_get_account(gc);
	username = purple_account_get_username(account);

	session = gc->proto_data;
	swboard = msn_session_find_swboard(session, who);

		msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);

		g_free(msgformat);
		g_free(msgtext);

		purple_debug_info("MSNP14","prepare to send online Message\n");
		if (g_ascii_strcasecmp(who, username))
		{
			MsnEmoticon *smile;
			GSList *smileys;
			GString *emoticons = NULL;

			if(msn_user_is_yahoo(account,who)){
				/*we send the online and offline Message to Yahoo User via UBM*/
				purple_debug_info("MSNP14","send to Yahoo User\n");
				uum_send_msg(session,msg);
			}else{
				purple_debug_info("MSNP14","send via switchboard\n");
				swboard = msn_session_get_swboard(session, who, MSN_SB_FLAG_IM);
				smileys = msn_msg_grab_emoticons(message, username);
				while (smileys) {
					smile = (MsnEmoticon*)smileys->data;
					emoticons = msn_msg_emoticon_add(emoticons, smile);

		msn_message_destroy(msg);
	} else {
		/*send Offline Instant Message,only to MSN Passport User*/
		char *friendname;

		purple_debug_info("MSNP14","prepare to send offline Message\n");

		friendname = msn_encode_mime(account->username);
		msn_oim_prep_send_msg_info(session->oim,
			purple_account_get_username(account),
			friendname, who, msgtext);

	session = gc->proto_data;
	userlist = session->userlist;
	who = msn_normalize(gc->account, buddy->name);

	purple_debug_info("MSN","Add user:%s to group:%s\n", who, (group && group->name) ? group->name : "(null)");
	if (!session->logged_in)
	{
#if 0
		fake_userlist_add_buddy(session->sync_userlist, who, MSN_LIST_FL,
								group ? group->name : NULL);

	MsnCmdProc *cmdproc;

	session = gc->proto_data;
	cmdproc = session->notification->cmdproc;

	purple_debug_info("MSN", "Remove group %s\n", group->name);
	/*we can't delete the default group*/
	if(!strcmp(group->name, MSN_INDIVIDUALS_GROUP_NAME)||
		!strcmp(group->name, MSN_NON_IM_GROUP_NAME))
	{
		purple_debug_info("MSN", "This group can't be removed, returning.\n");
		return ;
	}

	msn_del_group(session, group->name);
}

	g_free(tmp);

#if PHOTO_SUPPORT
	/* Find the URL to the photo; must be before the marshalling [Bug 994207] */
	photo_url_text = msn_get_photo_url(url_text);
	purple_debug_info("MSNP14","photo url:{%s}\n", photo_url_text ? photo_url_text : "(null)");

	/* Marshall the existing state */
	info2_data = g_new0(MsnGetInfoStepTwoData, 1);
	info2_data->info_data = info_data;
	info2_data->stripped = stripped;

23519:7bceac816e19

	MsnMessage *msg;
	char *msgformat;
	char *msgtext;
	const char *username;

	purple_debug_info("msn", "send IM {%s} to %s\n",message,who);
	account = purple_connection_get_account(gc);
	username = purple_account_get_username(account);

	session = gc->proto_data;
	swboard = msn_session_find_swboard(session, who);

		msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);

		g_free(msgformat);
		g_free(msgtext);

		purple_debug_info("msn", "prepare to send online Message\n");
		if (g_ascii_strcasecmp(who, username))
		{
			MsnEmoticon *smile;
			GSList *smileys;
			GString *emoticons = NULL;

			if(msn_user_is_yahoo(account,who)){
				/*we send the online and offline Message to Yahoo User via UBM*/
				purple_debug_info("msn", "send to Yahoo User\n");
				uum_send_msg(session,msg);
			}else{
				purple_debug_info("msn", "send via switchboard\n");
				swboard = msn_session_get_swboard(session, who, MSN_SB_FLAG_IM);
				smileys = msn_msg_grab_emoticons(message, username);
				while (smileys) {
					smile = (MsnEmoticon*)smileys->data;
					emoticons = msn_msg_emoticon_add(emoticons, smile);

		msn_message_destroy(msg);
	} else {
		/*send Offline Instant Message,only to MSN Passport User*/
		char *friendname;

		purple_debug_info("msn", "prepare to send offline Message\n");

		friendname = msn_encode_mime(account->username);
		msn_oim_prep_send_msg_info(session->oim,
			purple_account_get_username(account),
			friendname, who, msgtext);

	session = gc->proto_data;
	userlist = session->userlist;
	who = msn_normalize(gc->account, buddy->name);

	purple_debug_info("msn", "Add user:%s to group:%s\n", who, (group && group->name) ? group->name : "(null)");
	if (!session->logged_in)
	{
#if 0
		fake_userlist_add_buddy(session->sync_userlist, who, MSN_LIST_FL,
								group ? group->name : NULL);

	MsnCmdProc *cmdproc;

	session = gc->proto_data;
	cmdproc = session->notification->cmdproc;

	purple_debug_info("msn", "Remove group %s\n", group->name);
	/*we can't delete the default group*/
	if(!strcmp(group->name, MSN_INDIVIDUALS_GROUP_NAME)||
		!strcmp(group->name, MSN_NON_IM_GROUP_NAME))
	{
		purple_debug_info("msn", "This group can't be removed, returning.\n");
		return ;
	}

	msn_del_group(session, group->name);
}

	g_free(tmp);

#if PHOTO_SUPPORT
	/* Find the URL to the photo; must be before the marshalling [Bug 994207] */
	photo_url_text = msn_get_photo_url(url_text);
	purple_debug_info("msn", "photo url:{%s}\n", photo_url_text ? photo_url_text : "(null)");

	/* Marshall the existing state */
	info2_data = g_new0(MsnGetInfoStepTwoData, 1);
	info2_data->info_data = info_data;
	info2_data->stripped = stripped;