diff options
| author | George Hazan <ghazan@miranda.im> | 2020-08-12 18:02:36 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-08-12 18:02:36 +0300 |
| commit | d47aa769b30c0c81e0f599b1c5ebee9da10c0d7b (patch) | |
| tree | 8991042711b2276225b61678872ee7b2593748cc /protocols | |
| parent | 744b0bd4a8d50a24c1f39b4561049076934ff5a4 (diff) | |
Jabber: picture inlining should be disabled for group chats (by design)
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/src/jabber_ft.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp index 4ce9ee23ac..83fdf87b1b 100644 --- a/protocols/JabberG/src/jabber_ft.cpp +++ b/protocols/JabberG/src/jabber_ft.cpp @@ -110,8 +110,8 @@ void CJabberProto::FtInitiate(filetransfer *ft) if (wchar_t *p = wcsrchr(filename, '\\'))
filename = p + 1;
- // if we enabled XEP-0231, try to inline a picture
- if (m_bInlinePictures && ProtoGetAvatarFileFormat(ft->std.szCurrentFile.w)) {
+ // if we enabled XEP-0231, try to inline a picture (but only for private chats)
+ if (m_bInlinePictures && ProtoGetAvatarFileFormat(ft->std.szCurrentFile.w) && !isChatRoom(ft->std.hContact)) {
if (FtTryInlineFile(ft)) {
mir_forkthread(FakeAckThread, ft);
return;
|