separate Folders handles removed from protocols

git-svn-id: http://svn.miranda-ng.org/main/trunk@6405 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 2 insertions, 10 deletions

diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index a3bc4bd041..b362c7a059 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -34,10 +34,7 @@ WhatsAppProto::WhatsAppProto(const char* proto_name, const TCHAR* username) :
 

 	WASocketConnection::initNetwork(m_hNetlibUser);

 

-	TCHAR *profile = Utils_ReplaceVarsT( _T("%miranda_avatarcache%"));

-	def_avatar_folder_ = std::tstring(profile) + _T("\\") + m_tszUserName;

-	mir_free(profile);

-	hAvatarFolder_ = FoldersRegisterCustomPathT(m_szModuleName, "Avatars", def_avatar_folder_.c_str());

+	def_avatar_folder_ = std::tstring( VARST( _T("%miranda_avatarcache%"))) + _T("\\") + m_tszUserName;

 

 	// Register group chat

 	GCREGISTER gcr = {0};

@@ -316,11 +313,7 @@ int WhatsAppProto::RequestFriendship(WPARAM wParam, LPARAM lParam)
 

 std::tstring WhatsAppProto::GetAvatarFolder()

 {

-	TCHAR path[MAX_PATH];

-	if ( hAvatarFolder_ && FoldersGetCustomPathT(hAvatarFolder_, path, SIZEOF(path), _T("")) == 0 )

-		return path;

-	else

-		return def_avatar_folder_;

+	return def_avatar_folder_;

 }

 

 int WhatsAppProto::Log(const char* fn, const char *fmt,...)

diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h
index 778db45ccf..a2be9e9e5a 100644
--- a/protocols/WhatsApp/src/proto.h
+++ b/protocols/WhatsApp/src/proto.h
@@ -151,7 +151,6 @@ public:
    HANDLE  update_loop_lock_;

 

    std::tstring def_avatar_folder_;

-   HANDLE  hAvatarFolder_;

 

    HANDLE m_hNetlibUser;

    WASocketConnection* conn;