From 94dcc72f13094157f344f284aec4edf0c0f5faa1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 11 Aug 2013 10:41:37 +0000
Subject: ProtoGetAvatarFormat, ProtoGetAvatarFileFormat, ProtoGetBufferFormat,
 ProtoGetAvatarExtension - standard helpers for protocol avatars' processing
 instead of the zoo that existed previously

git-svn-id: http://svn.miranda-ng.org/main/trunk@5645 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_vcard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'protocols/JabberG/src/jabber_vcard.cpp')

diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp
index 566c276bf2..08b1e70b13 100644
--- a/protocols/JabberG/src/jabber_vcard.cpp
+++ b/protocols/JabberG/src/jabber_vcard.cpp
@@ -1158,7 +1158,7 @@ void CJabberProto::SetServerVcard(BOOL bPhotoChanged, TCHAR* szPhotoFileName)
 						if ((str=mir_base64_encode((PBYTE)buffer, nRead)) != NULL) {
 							n = v << XCHILD(_T("PHOTO"));
 							TCHAR *szFileType;
-							switch(JabberGetPictureType(buffer)) {
+							switch( ProtoGetBufferFormat(buffer)) {
 								case PA_FORMAT_PNG:  szFileType = _T("image/png");   break;
 								case PA_FORMAT_GIF:  szFileType = _T("image/gif");   break;
 								case PA_FORMAT_BMP:  szFileType = _T("image/bmp");   break;
@@ -1181,7 +1181,7 @@ void CJabberProto::SetServerVcard(BOOL bPhotoChanged, TCHAR* szPhotoFileName)
 							for (int j=0; j<MIR_SHA1_HASH_SIZE; j++)
 								sprintf(buf+(j<<1), "%02x", digest[j]);
 
-							m_options.AvatarType = JabberGetPictureType(buffer);
+							m_options.AvatarType = ProtoGetBufferFormat(buffer);
 
 							if (bPhotoChanged) {
 								DeleteFile(szAvatarName);
-- 
cgit v1.2.3