Mercurial > pidgin.yaz
changeset 12886:d8e8feac6cce
[gaim-migrate @ 15238]
Add an account option in MSN to disable custom smileys
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 15 Jan 2006 18:13:03 +0000 |
| parents | b704e60fe5de |
| children | 4229503f1cd9 |
| files | src/protocols/msn/msn.c src/protocols/msn/slp.c |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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,
--- 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);