diff options
Diffstat (limited to 'protocols/Facebook')
| -rw-r--r-- | protocols/Facebook/src/proto.cpp | 6 | ||||
| -rw-r--r-- | protocols/Facebook/src/server.cpp | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/protocols/Facebook/src/proto.cpp b/protocols/Facebook/src/proto.cpp index 6f3209fe02..30f0d7163f 100644 --- a/protocols/Facebook/src/proto.cpp +++ b/protocols/Facebook/src/proto.cpp @@ -137,12 +137,10 @@ void FacebookProto::OnModulesLoaded() VARSW wszCache(L"%miranda_avatarcache%");
CMStringW wszPath(FORMAT, L"%s\\%S\\Stickers\\*.png", wszCache.get(), m_szModuleName);
- SMADD_CONT cont = { SMADD_FOLDER, m_szModuleName, wszPath };
- CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
+ SmileyAdd_LoadContactSmileys(SMADD_FOLDER, m_szModuleName, wszPath);
wszPath.Format(L"%s\\%S\\Stickers\\*.webp", wszCache.get(), m_szModuleName);
- cont.path = wszPath;
- CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
+ SmileyAdd_LoadContactSmileys(SMADD_FOLDER, m_szModuleName, wszPath);
// contacts cache
for (auto &cc : AccContacts()) {
diff --git a/protocols/Facebook/src/server.cpp b/protocols/Facebook/src/server.cpp index 482db30bd7..fcf1aacb2e 100644 --- a/protocols/Facebook/src/server.cpp +++ b/protocols/Facebook/src/server.cpp @@ -732,7 +732,7 @@ void FacebookProto::OnPublishPrivateMessage(const JSONNode &root) // parse stickers
CMStringA stickerId = root["stickerId"].as_mstring();
if (!stickerId.IsEmpty()) {
- if (ServiceExists(MS_SMILEYADD_LOADCONTACTSMILEYS)) {
+ if (ServiceExists(MS_SMILEYADD_REPLACESMILEYS)) {
CMStringW wszPath(FORMAT, L"%s\\%S\\Stickers", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
CreateDirectoryTreeW(wszPath);
@@ -783,8 +783,7 @@ void FacebookProto::OnPublishPrivateMessage(const JSONNode &root) szBody += "\r\n";
szBody += "STK{" + stickerId + "}";
- SMADD_CONT cont = { SMADD_FILE, m_szModuleName, wszFileName };
- CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
+ SmileyAdd_LoadContactSmileys(SMADD_FILE, m_szModuleName, wszFileName);
}
else szBody += TranslateU("Sticker received");
}
|