From 2bb514f4195c99b52e0ec748c975c0fd30dbbd25 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 1 Jun 2015 18:10:32 +0000 Subject: another bunch of dead crutches: non-unicode avatar services git-svn-id: http://svn.miranda-ng.org/main/trunk@13961 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/avatars.cpp | 10 +++++----- protocols/FacebookRM/src/proto.cpp | 4 ++-- protocols/FacebookRM/src/proto.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'protocols/FacebookRM/src') diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp index 3f9dfa0994..d758e005ce 100644 --- a/protocols/FacebookRM/src/avatars.cpp +++ b/protocols/FacebookRM/src/avatars.cpp @@ -22,7 +22,7 @@ along with this program. If not, see . #include "stdafx.h" -bool FacebookProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &ai, std::string *url) +bool FacebookProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATION &ai, std::string *url) { ptrA id(getStringA(ai.hContact, FACEBOOK_KEY_ID)); if (id == NULL) @@ -75,7 +75,7 @@ void FacebookProto::CheckAvatarChange(MCONTACT hContact, const std::string &imag setString(hContact, FACEBOOK_KEY_AVATAR, image_name.c_str()); if (!hContact) { - PROTO_AVATAR_INFORMATIONT ai = { sizeof(ai) }; + PROTO_AVATAR_INFORMATION ai = { sizeof(ai) }; if (GetAvatarInfo(update_required ? GAIF_FORCE : 0, (LPARAM)&ai) != GAIR_WAITFOR) CallService(MS_AV_REPORTMYAVATARCHANGED, (WPARAM)m_szModuleName, 0); } @@ -96,7 +96,7 @@ void FacebookProto::UpdateAvatarWorker(void *) for (;;) { std::string url; - PROTO_AVATAR_INFORMATIONT ai = { sizeof(ai) }; + PROTO_AVATAR_INFORMATION ai = { sizeof(ai) }; ai.hContact = avatar_queue[0]; if (Miranda_Terminated()) @@ -178,7 +178,7 @@ INT_PTR FacebookProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam) if (!lParam) return GAIR_NOAVATAR; - PROTO_AVATAR_INFORMATIONT* AI = (PROTO_AVATAR_INFORMATIONT*)lParam; + PROTO_AVATAR_INFORMATION* AI = (PROTO_AVATAR_INFORMATION*)lParam; if (GetDbAvatarInfo(*AI, NULL)) { bool fileExist = _taccess(AI->filename, 0) == 0; @@ -220,7 +220,7 @@ INT_PTR FacebookProto::GetMyAvatar(WPARAM wParam, LPARAM lParam) TCHAR* buf = (TCHAR*)wParam; int size = (int)lParam; - PROTO_AVATAR_INFORMATIONT ai = { sizeof(ai) }; + PROTO_AVATAR_INFORMATION ai = { sizeof(ai) }; switch (GetAvatarInfo(0, (LPARAM)&ai)) { case GAIR_SUCCESS: _tcsncpy(buf, ai.filename, size); diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 2f92f63a5c..fee5b2d6f9 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -59,8 +59,8 @@ FacebookProto::FacebookProto(const char* proto_name, const TCHAR* username) : CreateProtoService(PS_CREATEACCMGRUI, &FacebookProto::SvcCreateAccMgrUI); CreateProtoService(PS_GETMYAWAYMSG, &FacebookProto::GetMyAwayMsg); - CreateProtoService(PS_GETMYAVATART, &FacebookProto::GetMyAvatar); - CreateProtoService(PS_GETAVATARINFOT, &FacebookProto::GetAvatarInfo); + CreateProtoService(PS_GETMYAVATAR, &FacebookProto::GetMyAvatar); + CreateProtoService(PS_GETAVATARINFO, &FacebookProto::GetAvatarInfo); CreateProtoService(PS_GETAVATARCAPS, &FacebookProto::GetAvatarCaps); CreateProtoService(PS_GETUNREADEMAILCOUNT, &FacebookProto::GetNotificationsCount); diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h index 9ee8f3ab07..e8b0c8c3c5 100644 --- a/protocols/FacebookRM/src/proto.h +++ b/protocols/FacebookRM/src/proto.h @@ -221,7 +221,7 @@ public: // Helpers std::tstring GetAvatarFolder(); - bool GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &ai, std::string *url); + bool GetDbAvatarInfo(PROTO_AVATAR_INFORMATION &ai, std::string *url); void CheckAvatarChange(MCONTACT hContact, const std::string &image_url); void ToggleStatusMenuItems(BOOL bEnable); void StickerAsSmiley(std::string stickerId, const std::string &url, MCONTACT hContact); -- cgit v1.2.3