summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/m_chat_int.h1
-rw-r--r--src/mir_app/src/chat_svc.cpp1
-rw-r--r--src/mir_app/src/srmm_base.cpp7
3 files changed, 7 insertions, 2 deletions
diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 9ae428dfeb..431ffd2a34 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -382,6 +382,7 @@ namespace Chat
{
extern MIR_APP_EXPORT CMOption<bool>
bShowNicklist,
+ bShowFormatting,
bFilterEnabled,
bTopicOnClist,
bPopupOnJoin,
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index d51b9b6487..cbefe28564 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "stdafx.h"
CMOption<bool> Chat::bShowNicklist(CHAT_MODULE, "ShowNicklist", true);
+CMOption<bool> Chat::bShowFormatting(CHAT_MODULE, "ShowFormatting", false); // Hidden option
CMOption<bool> Chat::bFilterEnabled(CHAT_MODULE, "FilterEnabled", false);
CMOption<bool> Chat::bTopicOnClist(CHAT_MODULE, "TopicOnClist", false);
CMOption<bool> Chat::bPopupOnJoin(CHAT_MODULE, "PopupOnJoin", false);
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index 9277a662c1..52c19a6b20 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -44,8 +44,8 @@ CSrmmBaseDialog::CSrmmBaseDialog(CMPluginBase &pPlugin, int idDialog, MCONTACT h
m_btnColor(this, IDC_SRMM_COLOR),
m_btnBkColor(this, IDC_SRMM_BKGCOLOR),
- m_btnBold(this, IDC_SRMM_BOLD),
+ m_btnBold(this, IDC_SRMM_BOLD),
m_btnItalic(this, IDC_SRMM_ITALICS),
m_btnUnderline(this, IDC_SRMM_UNDERLINE),
m_btnStrikeout(this, IDC_SRMM_STRIKEOUT),
@@ -547,7 +547,10 @@ bool CSrmmBaseDialog::OnInitDialog()
// three buttons below are initiated inside this call, so button creation must precede subclassing
Srmm_CreateToolbarIcons(this, isChat() ? BBBF_ISCHATBUTTON : BBBF_ISIMBUTTON);
- m_bSendFormat = ((CallContactService(m_hContact, PS_GETCAPS, PFLAGNUM_4) & PF4_SERVERFORMATTING) != 0);
+ if (Chat::bShowFormatting)
+ m_bSendFormat = true;
+ else
+ m_bSendFormat = ((CallContactService(m_hContact, PS_GETCAPS, PFLAGNUM_4) & PF4_SERVERFORMATTING) != 0);
if (!m_bSendFormat) {
m_btnBold.Disable();
m_btnItalic.Disable();