diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-07-10 13:54:28 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-07-10 13:54:28 +0000 |
| commit | 3bcc4ebb3e1a43574fb934a80903feaa56642089 (patch) | |
| tree | 254424be4b3f19e17a089bee94c66ce2acac0106 /protocols/JabberG/src/jabber_svc.cpp | |
| parent | d5d50b471277d5d69f59a8f29bf87201149ce191 (diff) | |
obsolete helper removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@5306 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_svc.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_svc.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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;
|