From 82a3bbaf034bc286665465d8904e6d1db52e5eb4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 8 Jan 2017 20:59:11 +0300 Subject: code cleaning --- protocols/GTalkExt/src/avatar.cpp | 6 +++--- protocols/JabberG/src/jabber_iqid.cpp | 2 +- protocols/MSN/src/msn.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols') diff --git a/protocols/GTalkExt/src/avatar.cpp b/protocols/GTalkExt/src/avatar.cpp index 36c6f4ff6a..621df70a90 100644 --- a/protocols/GTalkExt/src/avatar.cpp +++ b/protocols/GTalkExt/src/avatar.cpp @@ -138,7 +138,7 @@ void SetAvatar(MCONTACT hContact) { mir_cslock lck(g_csSetAvatar); - avatarCacheEntry *ava = (avatarCacheEntry*)CallService(MS_AV_GETAVATARBITMAP, hContact, 0); + AVATARCACHEENTRY *ava = (AVATARCACHEENTRY*)CallService(MS_AV_GETAVATARBITMAP, hContact, 0); if (ava && GetFileAttributes(&ava->szFilename[0]) != INVALID_FILE_ATTRIBUTES) return; @@ -153,7 +153,7 @@ void SetAvatar(MCONTACT hContact) return; if (ava) - CallService(MS_AV_SETAVATART, hContact, (LPARAM)L""); - CallService(MS_AV_SETAVATART, hContact, (LPARAM)avaFile); + CallService(MS_AV_SETAVATARW, hContact, (LPARAM)L""); + CallService(MS_AV_SETAVATARW, hContact, (LPARAM)avaFile); db_set_ws(hContact, SRMM_MODULE_NAME, SRMM_AVATAR_SETTING_NAME, avaFile); } diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index a72bbf3eeb..a91cd1d3d4 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -608,7 +608,7 @@ void CJabberProto::OnIqResultGetVcardPhoto(HXML n, MCONTACT hContact, bool &hasP debugLogA("%d bytes written", nWritten); if (hContact == NULL) { hasPhoto = true; - CallService(MS_AV_SETMYAVATART, (WPARAM)m_szModuleName, (LPARAM)szAvatarFileName); + CallService(MS_AV_SETMYAVATARW, (WPARAM)m_szModuleName, (LPARAM)szAvatarFileName); debugLogW(L"My picture saved to %s", szAvatarFileName); } diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp index 30f52a74f2..6be1bed1dd 100644 --- a/protocols/MSN/src/msn.cpp +++ b/protocols/MSN/src/msn.cpp @@ -79,7 +79,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID) // OnModulesLoaded - finalizes plugin's configuration on load static int OnModulesLoaded(WPARAM, LPARAM) { - avsPresent = ServiceExists(MS_AV_SETMYAVATART) != 0; + avsPresent = ServiceExists(MS_AV_SETMYAVATARW) != 0; MsnLinks_Init(); -- cgit v1.2.3