StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr1712'

Browse Source
This commit is contained in:
tux3 2015-05-24 14:43:13 +02:00
commit d16f9a542e
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chatlog/chatmessage.cpp
View File

@ -46,8 +46,6 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString &sender, const QSt
if (Settings::getInstance().getUseEmoticons())
text = SmileyPack::getInstance().smileyfied(text);
//quotes (green text)
text = detectQuotes(detectAnchors(text));
switch(type)
{
@ -57,9 +55,13 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString &sender, const QSt
msg->setAsAction();
break;
case ALERT:
// quotes should not be available for action messages ↑
text = detectQuotes(detectAnchors(text)); //quotes (green text)
text = wrapDiv(text, "alert");
break;
default:
// quotes should not be avaialble for action messages
text = detectQuotes(detectAnchors(text)); //quotes (green text)
text = wrapDiv(text, "msg");
}