diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-03-01 22:15:29 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-03-01 22:15:29 +0000 |
| commit | ec4498ee255a018ccb16061de4594618e7ab5690 (patch) | |
| tree | 4d11ae3444c95fba70568b56897acee497a7e6f9 /src/core | |
| parent | 12012a3ea4d58c6624f8065c2ca2afb96090b70f (diff) | |
service call replaced with helper: MS_UTILS_PATHTORELATIVE
git-svn-id: http://svn.miranda-ng.org/main/trunk@3826 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdchat/src/options.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdclist/src/clcopts.cpp | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index 6eb8721533..75e56a0f60 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -657,7 +657,7 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA }
{
TCHAR szTemp[MAX_PATH];
- CallService(MS_UTILS_PATHTORELATIVET, (WPARAM)g_Settings.pszLogDir, (LPARAM)szTemp );
+ PathToRelativeT(g_Settings.pszLogDir, szTemp);
SetDlgItemText(hwndDlg, IDC_LOGDIRECTORY, szTemp);
}
SetDlgItemText(hwndDlg, IDC_HIGHLIGHTWORDS, g_Settings.pszHighlightWords);
@@ -710,7 +710,7 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA if ( idList ) {
SHGetPathFromIDList(idList,szDirectory);
lstrcat(szDirectory, _T("\\"));
- CallService(MS_UTILS_PATHTORELATIVET, (WPARAM)szDirectory, (LPARAM)szTemp);
+ PathToRelativeT(szDirectory, szTemp);
SetDlgItemText(hwndDlg, IDC_LOGDIRECTORY, lstrlen(szTemp) > 1 ? szTemp : _T("Logs\\"));
CoTaskMemFree(idList);
}
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 2f29d8570a..61c69e5849 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -391,12 +391,8 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, {
char str[MAX_PATH], strrel[MAX_PATH];
GetDlgItemTextA(hwndDlg, IDC_FILENAME, str, SIZEOF(str));
- if (ServiceExists(MS_UTILS_PATHTORELATIVE)) {
- if (CallService(MS_UTILS_PATHTORELATIVE, (WPARAM) str, (LPARAM) strrel))
- DBWriteContactSettingString(NULL, "CLC", "BkBitmap", strrel);
- else
- DBWriteContactSettingString(NULL, "CLC", "BkBitmap", str);
- }
+ if ( PathToRelative(str, strrel))
+ DBWriteContactSettingString(NULL, "CLC", "BkBitmap", strrel);
else
DBWriteContactSettingString(NULL, "CLC", "BkBitmap", str);
}
|