From 5542cf1738d621565ac71b8d02244234a9865a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Tue, 26 Feb 2013 21:39:27 +0000 Subject: Reverted custom smileys in outgoing messages for now, we need better solution for them. git-svn-id: http://svn.miranda-ng.org/main/trunk@3788 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/services.cpp | 4 ++-- protocols/FacebookRM/src/messages.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index c7f915eec9..b2e749305b 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -102,8 +102,8 @@ INT_PTR ReplaceSmileysCommand(WPARAM, LPARAM lParam) else if (smrec.rangeToReplace->cpMax < 0) smrec.rangeToReplace->cpMax = LONG_MAX; SmileyPackCType* smcp = NULL; - SmileyPackType* SmileyPack = GetSmileyPack(smrec.Protocolname, smrec.hContact,/* - (smrec.flags & (SAFLRE_OUTGOING | SAFLRE_NOCUSTOM)) ? NULL : */&smcp); + SmileyPackType* SmileyPack = GetSmileyPack(smrec.Protocolname, smrec.hContact, + (smrec.flags & (SAFLRE_OUTGOING | SAFLRE_NOCUSTOM)) ? NULL : &smcp); ReplaceSmileys(smre->hwndRichEditControl, SmileyPack, smcp, *smrec.rangeToReplace, smrec.hContact == NULL, false, false, (smre->flags & SAFLRE_FIREVIEW)?true:false); diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp index 4ff94a1bde..85a9f3c17a 100644 --- a/protocols/FacebookRM/src/messages.cpp +++ b/protocols/FacebookRM/src/messages.cpp @@ -54,7 +54,7 @@ void FacebookProto::SendMsgWorker(void *p) } else if ( !DBGetContactSettingString(data->hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv)) { - parseSmileys(data->msg, data->hContact); + //parseSmileys(data->msg, data->hContact); int retries = 5; std::string error_text = ""; -- cgit v1.2.3