# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1137348783 0
# Node ID d8e8feac6cceb1ae421f7ed13d87bec18d4c9f25
# Parent  b704e60fe5de8262c378e1b90c0edae7f66c5c7f
[gaim-migrate @ 15238]
Add an account option in MSN to disable custom smileys

committer: Tailor Script <tailor@pidgin.im>

diff -r b704e60fe5de -r d8e8feac6cce src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Sun Jan 15 16:34:06 2006 +0000
+++ b/src/protocols/msn/msn.c	Sun Jan 15 18:13:03 2006 +0000
@@ -1952,6 +1952,11 @@
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
+	option = gaim_account_option_bool_new(_("Show custom smileys"),
+										  "custom_smileys", TRUE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+											   option);
+
 	gaim_cmd_register("nudge", "", GAIM_CMD_P_PRPL,
 	                  GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_PRPL_ONLY,
 	                 "prpl-msn", msn_cmd_nudge,
diff -r b704e60fe5de -r d8e8feac6cce src/protocols/msn/slp.c
--- a/src/protocols/msn/slp.c	Sun Jan 15 16:34:06 2006 +0000
+++ b/src/protocols/msn/slp.c	Sun Jan 15 18:13:03 2006 +0000
@@ -796,6 +796,9 @@
 
 	session = cmdproc->servconn->session;
 
+	if (!gaim_account_get_bool(session->account, "custom_smileys", TRUE))
+		return;
+
 	body = msn_message_get_bin_data(msg, &body_len);
 	body_str = g_strndup(body, body_len);