From a075d35ca850f06170553d17ca464f0f5feadd97 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 8 Oct 2013 18:28:51 +0000
Subject: separate Folders handles removed from protocols

git-svn-id: http://svn.miranda-ng.org/main/trunk@6405 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/VKontakte/src/vk_avatars.cpp | 8 +-------
 protocols/VKontakte/src/vk_proto.cpp   | 3 ---
 protocols/VKontakte/src/vk_proto.h     | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'protocols/VKontakte')

diff --git a/protocols/VKontakte/src/vk_avatars.cpp b/protocols/VKontakte/src/vk_avatars.cpp
index 17a43318dc..b2b6ef7fb8 100644
--- a/protocols/VKontakte/src/vk_avatars.cpp
+++ b/protocols/VKontakte/src/vk_avatars.cpp
@@ -93,13 +93,7 @@ INT_PTR CVkProto::SvcGetAvatarInfo(WPARAM wParam, LPARAM lParam)
 
 void CVkProto::GetAvatarFileName(HANDLE hContact, TCHAR* pszDest, size_t cbLen)
 {
-	size_t tPathLen;
-	TCHAR *path = (TCHAR*)_alloca(cbLen * sizeof(TCHAR));
-
-	if (m_hAvatarFolder == NULL || FoldersGetCustomPathT(m_hAvatarFolder, path, (int)cbLen, _T("")))
-		tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%S"), (TCHAR*)VARST(_T("%miranda_avatarcache%")), m_szModuleName);
-	else
-		tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s"), path);
+	int tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%S"), VARST(_T("%miranda_avatarcache%")), m_szModuleName);
 
 	DWORD dwAttributes = GetFileAttributes(pszDest);
 	if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index eebd495e3b..c544fbd5f1 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -37,9 +37,6 @@ CVkProto::CVkProto(const char *szModuleName, const TCHAR *ptszUserName) :
 	nlu.ptszDescriptiveName = descr;
 	m_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
 
-	mir_sntprintf(descr, SIZEOF(descr), _T("%%miranda_avatarcache%%\\%s"), m_tszUserName);
-	m_hAvatarFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, descr, m_tszUserName);
-
 	m_defaultGroup = getTStringA("ProtoGroup");
 	if (m_defaultGroup == NULL)
 		m_defaultGroup = mir_tstrdup( TranslateT("VKontakte"));
diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index 7efe705fa8..d6a6a3259e 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -145,7 +145,6 @@ private:
 	bool   m_bOnline;
 
 	HANDLE m_hNetlibUser, m_hNetlibConn;
-	HANDLE m_hAvatarFolder;
 	ptrA   m_szAccessToken, m_myUserId;
 	ptrT   m_defaultGroup;
 	UINT_PTR m_timer;
-- 
cgit v1.2.3