diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-01 20:40:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-01 20:40:05 +0000 |
| commit | acd4daf132c8ff3b05df7615e95f60be2fb82ddb (patch) | |
| tree | ff5836cfc26ab245a356d15c90d36ece29f07189 /protocols/JabberG/src/jabber_svc.cpp | |
| parent | 9de7eaca48475e8e5c7f04b72451983ace0ccee5 (diff) | |
various quirks with PROTO_AVATAR_INFORMATION declarations
git-svn-id: http://svn.miranda-ng.org/main/trunk@13965 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_svc.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_svc.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index 45413a7e89..916a3ce87c 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -121,34 +121,34 @@ INT_PTR __cdecl CJabberProto::JabberGetAvatarInfo(WPARAM wParam, LPARAM lParam) if (!m_options.EnableAvatars)
return GAIR_NOAVATAR;
- PROTO_AVATAR_INFORMATION* AI = (PROTO_AVATAR_INFORMATION*)lParam;
+ PROTO_AVATAR_INFORMATION* pai = (PROTO_AVATAR_INFORMATION*)lParam;
- ptrA szHashValue( getStringA(AI->hContact, "AvatarHash"));
+ ptrA szHashValue( getStringA(pai->hContact, "AvatarHash"));
if (szHashValue == NULL) {
debugLogA("No avatar");
return GAIR_NOAVATAR;
}
TCHAR tszFileName[MAX_PATH];
- GetAvatarFileName(AI->hContact, tszFileName, SIZEOF(tszFileName));
- _tcsncpy_s(AI->filename, tszFileName, _TRUNCATE);
+ GetAvatarFileName(pai->hContact, tszFileName, SIZEOF(tszFileName));
+ _tcsncpy_s(pai->filename, tszFileName, _TRUNCATE);
- AI->format = (AI->hContact == NULL) ? PA_FORMAT_PNG : getByte(AI->hContact, "AvatarType", 0);
+ pai->format = (pai->hContact == NULL) ? PA_FORMAT_PNG : getByte(pai->hContact, "AvatarType", 0);
- if (::_taccess(AI->filename, 0) == 0) {
- ptrA szSavedHash( getStringA(AI->hContact, "AvatarSaved"));
+ if (::_taccess(pai->filename, 0) == 0) {
+ ptrA szSavedHash( getStringA(pai->hContact, "AvatarSaved"));
if (szSavedHash != NULL && !mir_strcmp(szSavedHash, szHashValue)) {
debugLogA("Avatar is Ok: %s == %s", szSavedHash, szHashValue);
return GAIR_SUCCESS;
}
}
- if ((wParam & GAIF_FORCE) != 0 && AI->hContact != NULL && m_bJabberOnline) {
- ptrT tszJid( getTStringA(AI->hContact, "jid"));
+ if ((wParam & GAIF_FORCE) != 0 && pai->hContact != NULL && m_bJabberOnline) {
+ ptrT tszJid( getTStringA(pai->hContact, "jid"));
if (tszJid != NULL) {
JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_ROSTER, tszJid);
if (item != NULL) {
- BOOL isXVcard = getByte(AI->hContact, "AvatarXVcard", 0);
+ BOOL isXVcard = getByte(pai->hContact, "AvatarXVcard", 0);
TCHAR szJid[JABBER_MAX_JID_LEN]; szJid[0] = 0;
if (item->arResources.getCount() != NULL && !isXVcard)
|