summaryrefslogtreecommitdiff
path: root/src/mir_app/src/filerecvdlg.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mir_app/src/filerecvdlg.cpp')
-rw-r--r--src/mir_app/src/filerecvdlg.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mir_app/src/filerecvdlg.cpp b/src/mir_app/src/filerecvdlg.cpp
index 58ef04afa6..e02a34f708 100644
--- a/src/mir_app/src/filerecvdlg.cpp
+++ b/src/mir_app/src/filerecvdlg.cpp
@@ -121,7 +121,7 @@ static void patchDir(wchar_t *str, size_t strSize)
mir_wstrcpy(str + len, L"\\");
}
-void GetContactReceivedFilesDir(MCONTACT hContact, wchar_t *szDir, int cchDir, BOOL patchVars)
+MIR_APP_DLL(wchar_t*) File::GetReceivedFolder(MCONTACT hContact, wchar_t *szDir, size_t cchDir, bool patchVars)
{
wchar_t tszTemp[MAX_PATH];
@@ -158,6 +158,7 @@ void GetContactReceivedFilesDir(MCONTACT hContact, wchar_t *szDir, int cchDir, B
patchDir(tszTemp, _countof(tszTemp));
RemoveInvalidPathChars(tszTemp);
mir_wstrncpy(szDir, tszTemp, cchDir);
+ return szDir;
}
void GetReceivedFilesDir(wchar_t *szDir, int cchDir)
@@ -223,7 +224,7 @@ public:
SetDlgItemText(m_hwnd, IDC_FROM, contactName);
wchar_t szPath[450];
- GetContactReceivedFilesDir(dat->hContact, szPath, _countof(szPath), TRUE);
+ File::GetReceivedFolder(dat->hContact, szPath, _countof(szPath), TRUE);
SetDlgItemText(m_hwnd, IDC_FILEDIR, szPath);
SHAutoComplete(GetWindow(GetDlgItem(m_hwnd, IDC_FILEDIR), GW_CHILD), 1);
@@ -280,7 +281,7 @@ public:
wchar_t szRecvDir[MAX_PATH], szDefaultRecvDir[MAX_PATH];
GetDlgItemText(m_hwnd, IDC_FILEDIR, szRecvDir, _countof(szRecvDir));
RemoveInvalidPathChars(szRecvDir);
- GetContactReceivedFilesDir(NULL, szDefaultRecvDir, _countof(szDefaultRecvDir), TRUE);
+ File::GetReceivedFolder(NULL, szDefaultRecvDir, _countof(szDefaultRecvDir), TRUE);
if (wcsnicmp(szRecvDir, szDefaultRecvDir, mir_wstrlen(szDefaultRecvDir))) {
char idstr[32];
ptrW wszValue;