summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-03-02 11:30:23 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-03-02 11:30:23 +0000
commita0bd83dbb96a4e45005fdab38fb7b3a17cdcb012 (patch)
tree236dd905cf5d45070a808bf5ea0b8c80f4362877 /protocols
parent8ef40f0bd018c6f9295977c206714db8d1e6159c (diff)
fixed for various Folders registration quirks
git-svn-id: http://svn.miranda-ng.org/main/trunk@3829 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/FacebookRM/src/proto.cpp4
-rw-r--r--protocols/Gadu-Gadu/src/gg_proto.cpp8
2 files changed, 3 insertions, 9 deletions
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index b50758c496..3379aed18f 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -70,9 +70,7 @@ FacebookProto::FacebookProto(const char* proto_name,const TCHAR* username)
SkinAddNewSoundExT( "NewsFeed", m_tszUserName, LPGENT( "News Feed" ));
SkinAddNewSoundExT( "OtherEvent", m_tszUserName, LPGENT( "Other Event" ));
- TCHAR *profile = Utils_ReplaceVarsT( _T("%miranda_avatarcache%"));
- def_avatar_folder_ = std::tstring(profile) + _T("\\") + m_tszUserName;
- mir_free(profile);
+ def_avatar_folder_ = std::tstring( VARST( _T("%miranda_avatarcache%"))) + _T("\\") + m_tszUserName;
hAvatarFolder_ = FoldersRegisterCustomPathT(m_szModuleName, "Avatars", def_avatar_folder_.c_str());
// Set all contacts offline -- in case we crashed
diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index fb98f5153d..8428c98967 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -66,14 +66,10 @@ GGPROTO::GGPROTO(const char* pszProtoName, const TCHAR* tszUserName)
db_set_dw(NULL, m_szModuleName, GG_KEY_LOGONTIME, 0);
TCHAR szPath[MAX_PATH];
- TCHAR *tmpPath = Utils_ReplaceVarsT( _T("%miranda_avatarcache%"));
- mir_sntprintf(szPath, MAX_PATH, _T("%s\\%s"), tmpPath, m_tszUserName);
- mir_free(tmpPath);
+ mir_sntprintf(szPath, MAX_PATH, _T("%s\\%s"), (TCHAR*)VARST( _T("%miranda_avatarcache%")), m_tszUserName);
hAvatarsFolder = FoldersRegisterCustomPathT(m_szModuleName, "Avatars", szPath);
- tmpPath = Utils_ReplaceVarsT( _T("%miranda_userdata%"));
- mir_sntprintf(szPath, MAX_PATH, _T("%s\\%s\\ImageCache"), tmpPath, m_tszUserName);
- mir_free(tmpPath);
+ mir_sntprintf(szPath, MAX_PATH, _T("%s\\%s\\ImageCache"), (TCHAR*)VARST( _T("%miranda_userdata%")), m_tszUserName);
hImagesFolder = FoldersRegisterCustomPathT(m_szModuleName, "Images", szPath);
DWORD dwVersion;