SmileyAdd:

- major update for custom smileys APIs (cause we have no MSN, there's no need to save MCONTACT for custom smileys);
- added path type = 2 to download whole folder for custom smileys;
- fixes #2524 (ICQ: стикеры должны приходить как custom smileys, а не как передачи файлов);
- fixes #2533 (SmileyAdd не всегда распознаёт стикеры);
- fixes #2532 (Полученные стикеры пропадают при переоткрытии окна);
- version bump

2 files changed, 4 insertions, 22 deletions

diff --git a/protocols/Facebook/src/proto.cpp b/protocols/Facebook/src/proto.cpp
index 87ca21d84b..d2011579de 100644
--- a/protocols/Facebook/src/proto.cpp
+++ b/protocols/Facebook/src/proto.cpp
@@ -134,23 +134,9 @@ FacebookProto::~FacebookProto()
 void FacebookProto::OnModulesLoaded()
 {
 	CMStringW wszPath(FORMAT, L"%s\\%S\\Stickers\\*.png", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
+	SMADD_CONT cont = { 2, m_szModuleName, wszPath };
+	CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 
-	WIN32_FIND_DATAW findData;
-	HANDLE hFind = FindFirstFileW(wszPath, &findData);
-	if (hFind != INVALID_HANDLE_VALUE) {
-		wszPath.Truncate(wszPath.GetLength() - 5);
-		do {
-			CMStringW wszFileName = wszPath + findData.cFileName;
-
-			SMADD_CONT cont;
-			cont.cbSize = sizeof(SMADD_CONT);
-			cont.hContact = 0;
-			cont.type = 1;
-			cont.path = wszFileName.GetBuffer();
-			CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, (LPARAM)&cont);
-		}
-			while (FindNextFileW(hFind, &findData));
-	}
 }
 
 void FacebookProto::OnShutdown()
diff --git a/protocols/Facebook/src/server.cpp b/protocols/Facebook/src/server.cpp
index d8fb1e2a1b..67e0ba323e 100644
--- a/protocols/Facebook/src/server.cpp
+++ b/protocols/Facebook/src/server.cpp
@@ -745,12 +745,8 @@ void FacebookProto::OnPublishPrivateMessage(const JSONNode &root)
 					szBody += "\r\n";
 				szBody += "STK{" + stickerId + "}";
 
-				SMADD_CONT cont;
-				cont.cbSize = sizeof(SMADD_CONT);
-				cont.hContact = pUser->hContact;
-				cont.type = 1;
-				cont.path = wszFileName.GetBuffer();
-				CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, (LPARAM)&cont);
+				SMADD_CONT cont = { 1, m_szModuleName, wszFileName };
+				CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 			}
 			else szBody += TranslateU("Sticker received");
 		}