comparison libpurple/protocols/msn/msn.c @ 20413:fd7b501cc9c8

fix up broken merge

20412:522f618a44b4

		}
		else
		{
			char *body_str, *body_enc, *pre, *post;
			const char *format;
			/*
			 * In MSN, you can't send messages to yourself, so
			 * we'll fake like we received it ;)
			 */
			body_str = msn_message_to_string(msg);

			g_free(body_enc);
			g_free(pre);
			g_free(post);

			serv_got_typing_stopped(gc, who);
			serv_got_im(gc, who, body_str, flags, time(NULL));
			g_free(body_str);
		}

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

		friendname = msn_encode_mime(account->username);
		msn_oim_prep_send_msg_info(oim, purple_account_get_username(account),
								   friendname, who,	message);
		msn_oim_send_msg(oim);
	}
	else
	{
		char *body_str, *body_enc, *pre, *post;
		const char *format;
		MsnIMData *imdata = g_new0(MsnIMData, 1);
		/*
		 * In MSN, you can't send messages to yourself, so
		 * we'll fake like we received it ;)
		 */
		body_str = msn_message_to_string(msg);
		body_enc = g_markup_escape_text(body_str, -1);
		g_free(body_str);

		format = msn_message_get_attr(msg, "X-MMS-IM-Format");
		msn_parse_format(format, &pre, &post);
		body_str = g_strdup_printf("%s%s%s", pre ? pre :  "",
								   body_enc ? body_enc : "", post ? post : "");
		g_free(body_enc);
		g_free(pre);
		g_free(post);

		serv_got_typing_stopped(gc, who);
		imdata->gc = gc;
		imdata->who = who;
		imdata->msg = body_str;
		imdata->flags = flags;
		imdata->when = time(NULL);
		g_idle_add(msn_send_me_im, imdata);
	}

	msn_message_destroy(msg);

	return 1;
}

static unsigned int

20413:fd7b501cc9c8

		}
		else
		{
			char *body_str, *body_enc, *pre, *post;
			const char *format;
			MsnIMData *imdata = g_new0(MsnIMData, 1);
			/*
			 * In MSN, you can't send messages to yourself, so
			 * we'll fake like we received it ;)
			 */
			body_str = msn_message_to_string(msg);

			g_free(body_enc);
			g_free(pre);
			g_free(post);

			serv_got_typing_stopped(gc, who);
			imdata->gc = gc;
			imdata->who = who;
			imdata->msg = body_str;
			imdata->flags = flags;
			imdata->when = time(NULL);
			g_idle_add(msn_send_me_im, imdata);
		}

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

		friendname = msn_encode_mime(account->username);
		msn_oim_prep_send_msg_info(oim, purple_account_get_username(account),
								   friendname, who,	message);
		msn_oim_send_msg(oim);
	}

	return 1;
}

static unsigned int