mode old database junk to die

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

1 files changed, 3 insertions, 5 deletions

diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index 72493df3da..243d3f8789 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -126,7 +126,7 @@ static wchar_t* parseDBProfileName(ARGUMENTSINFO *ai)
 		return NULL;

 

 	wchar_t name[MAX_PATH];

-	if (CallService(MS_DB_GETPROFILENAMEW, _countof(name), (LPARAM)name))

+	if (Profile_GetNameW(_countof(name), name))

 		return NULL;

 

 	return mir_wstrdup(name);

@@ -138,9 +138,7 @@ static wchar_t* parseDBProfilePath(ARGUMENTSINFO *ai)
 		return NULL;

 

 	wchar_t path[MAX_PATH];

-	if (CallService(MS_DB_GETPROFILEPATHW, _countof(path), (LPARAM)path))

-		return NULL;

-

+	Profile_GetPathW(_countof(path), path);

 	return mir_wstrdup(path);

 }

 

@@ -579,7 +577,7 @@ static wchar_t* parseDbEvent(ARGUMENTSINFO *ai)
 		return NULL;

 	}

 

-	wchar_t *res = DbGetEventTextW(&dbe, CP_ACP);

+	wchar_t *res = DbEvent_GetTextW(&dbe, CP_ACP);

 	mir_free(dbe.pBlob);

 	return res;

 }