diff options
| -rw-r--r-- | plugins/TabSRMM/src/mim.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/themes.cpp | 3 | ||||
| -rw-r--r-- | plugins/VersionInfo/src/hooked_events.cpp | 2 | ||||
| -rw-r--r-- | protocols/FacebookRM/src/proto.cpp | 4 | ||||
| -rw-r--r-- | protocols/Gadu-Gadu/src/gg_proto.cpp | 8 |
5 files changed, 6 insertions, 13 deletions
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index 9da9942175..b96f72b353 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -378,7 +378,7 @@ const TCHAR* CMimAPI::getUserDir() {
if (m_userDir[0] == 0) {
if ( ServiceExists(MS_FOLDERS_REGISTER_PATH))
- lstrcpyn(m_userDir, L"%%miranda_userdata%%", SIZEOF(m_userDir));
+ lstrcpyn(m_userDir, L"%miranda_userdata%", SIZEOF(m_userDir));
else
lstrcpyn(m_userDir, VARST( _T("%miranda_userdata%")), SIZEOF(m_userDir));
diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index e2032d04c6..05b5631bfd 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -2798,8 +2798,7 @@ void CSkin::setAeroEffect(LRESULT effect) */
void CSkin::extractSkinsAndLogo(bool fForceOverwrite) const
{
- TCHAR tszBasePath[MAX_PATH];
-
+ TCHAR tszBasePath[MAX_PATH];
mir_sntprintf(tszBasePath, MAX_PATH, _T("%s"), M->getDataPath());
if (tszBasePath[lstrlen(tszBasePath) - 1] != '\\')
_tcscat(tszBasePath, _T("\\"));
diff --git a/plugins/VersionInfo/src/hooked_events.cpp b/plugins/VersionInfo/src/hooked_events.cpp index 44c24ec9ef..71fb4e649c 100644 --- a/plugins/VersionInfo/src/hooked_events.cpp +++ b/plugins/VersionInfo/src/hooked_events.cpp @@ -49,7 +49,7 @@ int UnhookEvents() int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
{
- hOutputLocation = FoldersRegisterCustomPathT("VersionInfo", "Output folder", _T("%miranda_path%"));
+ hOutputLocation = FoldersRegisterCustomPathT("VersionInfo", "Output folder", MIRANDA_PATHT);
GetStringFromDatabase("UUIDCharMark", _T(DEF_UUID_CHARMARK), PLUGIN_UUID_MARK, cPLUGIN_UUID_MARK);
return 0;
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;
|