From 8c85373fcb86aae9a09e19cae045fa667ba929a4 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 30 Nov 2012 16:26:36 +0000
Subject: some helpers wiped out of ICQ

git-svn-id: http://svn.miranda-ng.org/main/trunk@2567 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IcqOscarJ/src/icq_avatar.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'protocols/IcqOscarJ/src/icq_avatar.cpp')

diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index c7027a54ee..65b69db92a 100644
--- a/protocols/IcqOscarJ/src/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
@@ -108,7 +108,7 @@ TCHAR* CIcqProto::GetOwnAvatarFileName()
 	{
 		TCHAR tmp[MAX_PATH * 2];
 		CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)dbvFile.ptszVal, (LPARAM)tmp);
-		ICQFreeVariant(&dbvFile);
+		db_free(&dbvFile);
 
 		return null_strdup(tmp);
 	}
@@ -286,11 +286,11 @@ int CIcqProto::IsAvatarChanged(HANDLE hContact, const BYTE *pHash, int nHashLen)
 	{
 		if ((dbvSaved.cpbVal != nHashLen) || memcmp(dbvSaved.pbVal, pHash, nHashLen))
 		{ // the hashes are different
-			ICQFreeVariant(&dbvSaved);
+			db_free(&dbvSaved);
 
 			return 2;
 		}
-		ICQFreeVariant(&dbvSaved);
+		db_free(&dbvSaved);
 
 		return 0; // hash is there and is the same - Success
 	}
@@ -604,7 +604,7 @@ void CIcqProto::handleAvatarContactHash(DWORD dwUIN, char *szUID, HANDLE hContac
 #ifdef _DEBUG
 				NetLog_Hash(this, "old", dbv.pbVal, dbv.cpbVal);
 #endif
-				ICQFreeVariant(&dbv);
+				db_free(&dbv);
 				NetLog_Server("%s has removed Avatar.", strUID(dwUIN, szUID));
 
 				deleteSetting(hContact, "AvatarHash");
@@ -713,7 +713,7 @@ void CIcqProto::handleAvatarContactHash(DWORD dwUIN, char *szUID, HANDLE hContac
 					bJob = 2;
 				}
 			}
-			ICQFreeVariant(&dbv);
+			db_free(&dbv);
 		}
 
 		if (bJob)
@@ -755,7 +755,7 @@ void CIcqProto::handleAvatarContactHash(DWORD dwUIN, char *szUID, HANDLE hContac
 #ifdef _DEBUG
 			NetLog_Hash(this, "old", dbv.pbVal, dbv.cpbVal);
 #endif
-			ICQFreeVariant(&dbv);
+			db_free(&dbv);
 			NetLog_Server("%s has removed Avatar.", strUID(dwUIN, szUID));
 
 			deleteSetting(hContact, "AvatarHash");
@@ -1687,7 +1687,7 @@ void avatars_server_connection::handleAvatarFam(BYTE *pBuffer, WORD wBufferLengt
 									if (ppro->setSettingBlob(pCookieData->hContact, "AvatarSaved", dbv.pbVal, dbv.cpbVal))
 										NetLog_Server("Failed to set file hash.");
 
-									ICQFreeVariant(&dbv);
+									db_free(&dbv);
 								}
 								else
 								{
-- 
cgit v1.2.3