From ec4498ee255a018ccb16061de4594618e7ab5690 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 1 Mar 2013 22:15:29 +0000 Subject: service call replaced with helper: MS_UTILS_PATHTORELATIVE git-svn-id: http://svn.miranda-ng.org/main/trunk@3826 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_mw/src/clcopts.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'plugins/Clist_mw') diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp index a812638c09..5d74eddc72 100644 --- a/plugins/Clist_mw/src/clcopts.cpp +++ b/plugins/Clist_mw/src/clcopts.cpp @@ -408,12 +408,10 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w 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)) - db_set_s(NULL,"StatusBar","BkBitmap",strrel); - else db_set_s(NULL,"StatusBar","BkBitmap",str); - } - else db_set_s(NULL,"StatusBar","BkBitmap",str); + if ( PathToRelative(str, strrel)) + db_set_s(NULL,"StatusBar","BkBitmap",strrel); + else + db_set_s(NULL,"StatusBar","BkBitmap",str); WORD flags = 0; if (IsDlgButtonChecked(hwndDlg,IDC_STRETCHH)) flags |= CLB_STRETCHH; @@ -530,12 +528,10 @@ 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)) - db_set_s(NULL,"CLC","BkBitmap",strrel); - else db_set_s(NULL,"CLC","BkBitmap",str); - } - else db_set_s(NULL,"CLC","BkBitmap",str); + if ( PathToRelative(str, strrel)) + db_set_s(NULL,"CLC","BkBitmap",strrel); + else + db_set_s(NULL,"CLC","BkBitmap",str); } { WORD flags = 0; if (IsDlgButtonChecked(hwndDlg,IDC_STRETCHH)) flags |= CLB_STRETCHH; -- cgit v1.2.3