From 427891e0d28becb428ae8435954399f2e4daa9fe Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 1 Mar 2013 22:52:26 +0000 Subject: service call replaced with helper: MS_UTILS_PATHTOABSOLUTEW git-svn-id: http://svn.miranda-ng.org/main/trunk@3827 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdchat/src/options.cpp | 4 ++-- src/core/stdclist/src/clcopts.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/core') diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index 75e56a0f60..d184b976ef 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -756,7 +756,7 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA } else db_unset(NULL, "Chat", "LogDirectory"); - CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)pszText, (LPARAM)g_Settings.pszLogDir); + PathToAbsoluteT(pszText, g_Settings.pszLogDir); iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_LOGTIMESTAMP)); if ( iLen > 0 ) { @@ -991,7 +991,7 @@ void LoadGlobalSettings(void) mir_free(tmpPath); } - CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)pszTemp, (LPARAM)g_Settings.pszLogDir); + PathToAbsoluteT(pszTemp, g_Settings.pszLogDir); } g_Settings.LogIndentEnabled = (DBGetContactSettingByte(NULL, "Chat", "LogIndentEnabled", 1) != 0)?TRUE:FALSE; diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 61c69e5849..fe578c6fd9 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -295,12 +295,11 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, DBVARIANT dbv; if (!DBGetContactSettingString(NULL, "CLC", "BkBitmap", &dbv)) { SetDlgItemTextA(hwndDlg, IDC_FILENAME, dbv.pszVal); - if (ServiceExists(MS_UTILS_PATHTOABSOLUTE)) { - char szPath[MAX_PATH]; - if (CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) dbv.pszVal, (LPARAM) szPath)) - SetDlgItemTextA(hwndDlg, IDC_FILENAME, szPath); - } + char szPath[MAX_PATH]; + if ( PathToAbsolute(dbv.pszVal, szPath)) + SetDlgItemTextA(hwndDlg, IDC_FILENAME, szPath); + DBFreeVariant(&dbv); } } -- cgit v1.2.3