From 427891e0d28becb428ae8435954399f2e4daa9fe Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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
---
 plugins/IEView/src/Options.cpp | 48 ++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

(limited to 'plugins/IEView/src/Options.cpp')

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);
 		}
-- 
cgit v1.2.3