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 --- protocols/IcqOscarJ/src/icq_avatar.cpp | 2 +- protocols/IcqOscarJ/src/icqosc_svcs.cpp | 2 +- protocols/MRA/src/MraAvatars.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp index 56f2ce55c4..53f4241c15 100644 --- a/protocols/IcqOscarJ/src/icq_avatar.cpp +++ b/protocols/IcqOscarJ/src/icq_avatar.cpp @@ -1674,7 +1674,7 @@ void avatars_server_connection::handleAvatarFam(BYTE *pBuffer, WORD wBufferLengt if (!pCookieData->hContact) // our avatar, set filename { TCHAR tmp[MAX_PATH * 2]; - CallService(MS_UTILS_PATHTORELATIVET, (WPARAM)tszImageFile, (LPARAM)tmp); + PathToRelativeT(tszImageFile, tmp); ppro->setSettingStringT(NULL, "AvatarFile", tmp); } else diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp index 6208a4635c..2d140d8094 100644 --- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp +++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp @@ -614,7 +614,7 @@ INT_PTR CIcqProto::SetMyAvatar(WPARAM wParam, LPARAM lParam) } TCHAR tmp[MAX_PATH]; - CallService(MS_UTILS_PATHTORELATIVET, (WPARAM)tszMyFile, (LPARAM)tmp); + PathToRelativeT(tszMyFile, tmp); setSettingStringT(NULL, "AvatarFile", tmp); iRet = 0; diff --git a/protocols/MRA/src/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp index 584b8adca6..0a5d5e48fb 100644 --- a/protocols/MRA/src/MraAvatars.cpp +++ b/protocols/MRA/src/MraAvatars.cpp @@ -350,7 +350,7 @@ void CMraProto::MraAvatarsThreadProc(LPVOID lpParameter) if ( db_get_b(NULL, MRA_AVT_SECT_NAME, "ReturnAbsolutePath", MRA_AVT_DEFAULT_RET_ABC_PATH)) lstrcpyn(pai.filename, wszFileName, SIZEOF(pai.filename)); else - CallService(MS_UTILS_PATHTORELATIVET, (WPARAM)wszFileName, (LPARAM)pai.filename ); + PathToRelativeT(wszFileName, pai.filename); if (bDefaultAvt) dwAvatarFormat = PA_FORMAT_DEFAULT; SetContactAvatarFormat(pmraaqiAvatarsQueueItem->hContact, dwAvatarFormat); @@ -610,7 +610,7 @@ DWORD CMraProto::MraAvatarsQueueGetAvatar(HANDLE hAvatarsQueueHandle, DWORD dwFl if (db_get_b(NULL, MRA_AVT_SECT_NAME, "ReturnAbsolutePath", MRA_AVT_DEFAULT_RET_ABC_PATH)) lstrcpyn(lpszPath, wszFileName, MAX_PATH); else - CallService( MS_UTILS_PATHTORELATIVET, (WPARAM)wszFileName, (LPARAM)lpszPath ); + PathToRelativeT(wszFileName, lpszPath); } if (pdwFormat) *pdwFormat = GetContactAvatarFormat(hContact, PA_FORMAT_DEFAULT); -- cgit v1.2.3