diff options
| author | Robert Pösel <robyer@seznam.cz> | 2016-09-06 03:53:05 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2016-09-06 03:53:05 +0000 |
| commit | 910d3cab907dc5649a01bab756dc78af74a23981 (patch) | |
| tree | fc0254ce435d41e553c0c1b815edc6a00067f465 /protocols/FacebookRM/src/json.cpp | |
| parent | a41b7bafb1181d2953c977b3c3f9ee3d746e5cd7 (diff) | |
Facebook: Improve loading history
* Allow loading history only for one contact at a time
* Make text in messagebox translatable and use question instead of warning type
* Don't load and refresh stickers during history loading (so it won't be slow)
git-svn-id: http://svn.miranda-ng.org/main/trunk@17264 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/FacebookRM/src/json.cpp')
| -rw-r--r-- | protocols/FacebookRM/src/json.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp index 720a842da8..19597bf2bd 100644 --- a/protocols/FacebookRM/src/json.cpp +++ b/protocols/FacebookRM/src/json.cpp @@ -333,7 +333,7 @@ void parseAttachments(FacebookProto *proto, std::string *message_text, const JSO attachments_text += sticker; // Stickers as smileys - if (proto->getByte(FACEBOOK_KEY_CUSTOM_SMILEYS, DEFAULT_CUSTOM_SMILEYS)) { + if (proto->getByte(FACEBOOK_KEY_CUSTOM_SMILEYS, DEFAULT_CUSTOM_SMILEYS) && !proto->facy.loading_history) { // FIXME: rewrite smileyadd to use custom smileys per protocol and not per contact and then remove this ugliness if (!other_user_fbid.empty()) { MCONTACT hContact = proto->ContactIDToHContact(other_user_fbid); |