diff options
| author | Vladimir <me@boku.ru> | 2018-01-31 17:01:42 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-01-31 22:09:55 +0300 |
| commit | b8f8623145589530eae0bdb957e5337537797a92 (patch) | |
| tree | e9c4054100cd577694805d3f9d63e8a8521bf9f6 /protocols/JabberG/src/jabber_thread.cpp | |
| parent | 73b0193a9d1792e8459b56415ab2fcfdeb6fb385 (diff) | |
Added an option to enable/disable carbons
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_thread.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 1177020ab0..4801e50179 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1062,6 +1062,10 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info) carbonSent = true;
}
if (carbon) {
+ //If carbons are disabled in options, we should ignore occasional carbons sent to us by server
+ if (!m_options.EnableCarbons)
+ return;
+
HXML forwarded = NULL;
HXML message = NULL;
//Carbons MUST have forwarded/message content
|