service call replaced with helper: MS_UTILS_PATHTOABSOLUTEW

git-svn-id: http://svn.miranda-ng.org/main/trunk@3827 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 24 insertions, 30 deletions

diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp
index e9ff0922f5..f3864a46d0 100644
--- a/plugins/IEView/src/Options.cpp
+++ b/plugins/IEView/src/Options.cpp
@@ -1538,27 +1538,25 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE) && strncmp(tmpPath, "http://", 7)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			if ( strncmp(tmpPath, "http://", 7))

+				PathToAbsolute(dbv.pszVal, tmpPath);

+

 			proto->setSRMMBackgroundFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_CSS);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE) && strncmp(tmpPath, "http://", 7)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			if ( strncmp(tmpPath, "http://", 7))

+				PathToAbsolute(dbv.pszVal, tmpPath);

+

 			proto->setSRMMCssFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_TEMPLATE);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			PathToAbsolute(dbv.pszVal, tmpPath);

 			proto->setSRMMTemplateFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

@@ -1573,27 +1571,25 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE) && strncmp(tmpPath, "http://", 7)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			if ( strncmp(tmpPath, "http://", 7))

+				PathToAbsolute(dbv.pszVal, tmpPath);

+

 			proto->setChatBackgroundFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_CSS);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE) && strncmp(tmpPath, "http://", 7)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			if ( strncmp(tmpPath, "http://", 7))

+				PathToAbsolute(dbv.pszVal, tmpPath);

+

 			proto->setChatCssFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_TEMPLATE);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			PathToAbsolute(dbv.pszVal, tmpPath);

 			proto->setChatTemplateFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

@@ -1608,27 +1604,25 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE) && strncmp(tmpPath, "http://", 7)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			if ( strncmp(tmpPath, "http://", 7))

+				PathToAbsolute(dbv.pszVal, tmpPath);

+

 			proto->setHistoryBackgroundFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_CSS);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE) && strncmp(tmpPath, "http://", 7)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			if ( strncmp(tmpPath, "http://", 7))

+				PathToAbsolute(dbv.pszVal, tmpPath);

+

 			proto->setHistoryCssFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_TEMPLATE);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

-			if (ServiceExists(MS_UTILS_PATHTOABSOLUTE)) {

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)tmpPath);

-			}

+			PathToAbsolute(dbv.pszVal, tmpPath);

 			proto->setHistoryTemplateFilename(tmpPath);

 			DBFreeVariant(&dbv);

 		}

diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index 3cc39d9d43..6a65eab30c 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -73,8 +73,8 @@ char *TemplateHTMLBuilder::getAvatar(HANDLE hContact, const char * szProto) {
 				if (result == NULL) {

 					/* relative -> absolute */

 					_tcscpy (tmpPath, dbv.ptszVal);

-					if (ServiceExists(MS_UTILS_PATHTOABSOLUTET) && _tcsncmp(tmpPath, _T("http://"), 7))

-						CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)dbv.ptszVal, (LPARAM)tmpPath);

+					if ( _tcsncmp(tmpPath, _T("http://"), 7))

+						PathToAbsoluteT(dbv.ptszVal, tmpPath);

 

 					result = tmpPath;

 				}

diff --git a/plugins/IEView/src/Utils.cpp b/plugins/IEView/src/Utils.cpp
index 5c52ae696a..d9a3f85043 100644
--- a/plugins/IEView/src/Utils.cpp
+++ b/plugins/IEView/src/Utils.cpp
@@ -30,7 +30,7 @@ HANDLE* Utils::hServices = NULL;
 const wchar_t *Utils::getBaseDir() {

 	char temp[MAX_PATH];

 	base_dir[0] = '\0';

-	long tlen = CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"miranda32.exe", (LPARAM)temp);

+	long tlen = PathToAbsolute("miranda32.exe", temp);

 	if (tlen) {

 		temp[tlen - 13]=0;

 		MultiByteToWideChar(CP_ACP, 0, temp, (int)strlen(temp), base_dir, MAX_PATH);