From bd3888b24a17f351cf4f884462e3135b6f87e876 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 19 Jan 2014 12:14:01 +0000 Subject: reverted Folders support for tabSRMM git-svn-id: http://svn.miranda-ng.org/main/trunk@7754 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/mim.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'plugins') diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index 9ecc0dd3cd..c96fe0a2ab 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -207,12 +207,6 @@ INT_PTR CMimAPI::foldersPathChanged() FoldersGetCustomPathT(m_hSkinsPath, szTemp, MAX_PATH, const_cast(getSkinPath())); mir_sntprintf(m_szSkinsPath, MAX_PATH - 1, _T("%s"), szTemp); - - /* - * make sure skins root path always ends with a '\' - this is assumed by the skin - * selection code. - */ - Utils::ensureTralingBackslash(m_szSkinsPath); FoldersGetCustomPathT(m_hAvatarsPath, szTemp, MAX_PATH, const_cast(getSavedAvatarPath())); @@ -220,23 +214,14 @@ INT_PTR CMimAPI::foldersPathChanged() FoldersGetCustomPathT(m_hChatLogsPath, szTemp, MAX_PATH, const_cast(getChatLogPath())); mir_sntprintf(m_szChatLogsPath, MAX_PATH, _T("%s"), szTemp); - Utils::ensureTralingBackslash(m_szChatLogsPath); + replaceStrT(g_Settings.pszLogDir, m_szChatLogsPath); } CreateDirectoryTreeT(m_szProfilePath); CreateDirectoryTreeT(m_szSkinsPath); CreateDirectoryTreeT(m_szSavedAvatarsPath); CreateDirectoryTreeT(m_szChatLogsPath); -#if defined(_FOLDER_LOCKING) - mir_sntprintf(szTemp, MAX_PATH, L"%sfolder.lck", m_szChatLogsPath); - - if (m_hChatLogLock != INVALID_HANDLE_VALUE) - CloseHandle(m_hChatLogLock); - - m_hChatLogLock = CreateFile(szTemp, GENERIC_WRITE, 0, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_HIDDEN, 0); -#endif - Skin->extractSkinsAndLogo(true); Skin->setupAeroSkins(); return 0; @@ -274,6 +259,8 @@ void CMimAPI::InitPaths() } Utils::ensureTralingBackslash(m_szChatLogsPath); + replaceStrT(g_Settings.pszLogDir, m_szChatLogsPath); + Utils::ensureTralingBackslash(m_szSkinsPath); mir_sntprintf(m_szSavedAvatarsPath, MAX_PATH, _T("%s\\Saved Contact Pictures"), m_szProfilePath); -- cgit v1.2.3