From 3bcc4ebb3e1a43574fb934a80903feaa56642089 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 10 Jul 2013 13:54:28 +0000 Subject: obsolete helper removed git-svn-id: http://svn.miranda-ng.org/main/trunk@5306 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_svc.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'protocols/JabberG/src/jabber_svc.cpp') diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index bb43eb2406..6248a03a23 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -129,8 +129,8 @@ INT_PTR __cdecl CJabberProto::JabberGetAvatarInfo(WPARAM wParam, LPARAM lParam) PROTO_AVATAR_INFORMATIONT* AI = (PROTO_AVATAR_INFORMATIONT*)lParam; - char szHashValue[ MAX_PATH ]; - if (JGetStaticString("AvatarHash", AI->hContact, szHashValue, sizeof szHashValue)) { + ptrA szHashValue( getStringA(AI->hContact, "AvatarHash")); + if (szHashValue == NULL) { Log("No avatar"); return GAIR_NOAVATAR; } @@ -142,12 +142,12 @@ INT_PTR __cdecl CJabberProto::JabberGetAvatarInfo(WPARAM wParam, LPARAM lParam) AI->format = (AI->hContact == NULL) ? PA_FORMAT_PNG : getByte(AI->hContact, "AvatarType", 0); if (::_taccess(AI->filename, 0) == 0) { - char szSavedHash[ 256 ]; - if ( !JGetStaticString("AvatarSaved", AI->hContact, szSavedHash, sizeof szSavedHash)) { - if ( !strcmp(szSavedHash, szHashValue)) { - Log("Avatar is Ok: %s == %s", szSavedHash, szHashValue); - return GAIR_SUCCESS; - } } } + ptrA szSavedHash( getStringA(AI->hContact, "AvatarSaved")); + if (szSavedHash != NULL && !strcmp(szSavedHash, szHashValue)) { + Log("Avatar is Ok: %s == %s", szSavedHash, szHashValue); + return GAIR_SUCCESS; + } + } if ((wParam & GAIF_FORCE) != 0 && AI->hContact != NULL && m_bJabberOnline) { DBVARIANT dbv; -- cgit v1.2.3