From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 5 Apr 2013 22:27:16 +0000
Subject: - rest of menus cleared; - old database macroses wiped out from all
 plugins (left in m_database.h for compatibility)

git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/IEView/src/TemplateHTMLBuilder.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index 09d2de312f..32ba30ee62 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -64,7 +64,7 @@ char *TemplateHTMLBuilder::getAvatar(HANDLE hContact, const char * szProto) {
 			}
 		}
 	}
-	if (!DBGetContactSettingTString(hContact, "ContactPhoto", "File", &dbv)) {
+	if (!db_get_ts(hContact, "ContactPhoto", "File", &dbv)) {
 		if (_tcslen(dbv.ptszVal) > 0) {
 			TCHAR* ext = _tcsrchr(dbv.ptszVal, '.');
 			if (ext && lstrcmpi(ext, _T(".xml")) == 0) {
@@ -80,7 +80,7 @@ char *TemplateHTMLBuilder::getAvatar(HANDLE hContact, const char * szProto) {
 				}
 			}
 		}
-		DBFreeVariant(&dbv);
+		db_free(&dbv);
 	}
 	char* res = mir_utf8encodeT(result);
 	Utils::convertPath(res);
@@ -221,11 +221,11 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 	if (szAvatarOut == NULL) {
 		szAvatarOut = mir_strdup(szNoAvatar);
 	}
-	if (!DBGetContactSetting(event->hContact, "CList", "StatusMsg",&dbv)) {
+	if (!db_get(event->hContact, "CList", "StatusMsg",&dbv)) {
 		if (strlen(dbv.pszVal) > 0) {
 			szStatusMsg = mir_utf8encode(dbv.pszVal);
 		}
-		DBFreeVariant(&dbv);
+		db_free(&dbv);
 	}
 	ZeroMemory(&ci, sizeof(ci));
 	ci.cbSize = sizeof(ci);
@@ -404,11 +404,11 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
 		szAvatarOut = mir_strdup(szNoAvatar);
 	}
 	if(event->hContact != NULL) {
-		if (!DBGetContactSetting(event->hContact, "CList", "StatusMsg",&dbv)) {
+		if (!db_get(event->hContact, "CList", "StatusMsg",&dbv)) {
 			if (strlen(dbv.pszVal) > 0) {
 				szStatusMsg = mir_utf8encode(dbv.pszVal);
 			}
-			DBFreeVariant(&dbv);
+			db_free(&dbv);
 		}
 	}
 	ZeroMemory(&ci, sizeof(ci));
-- 
cgit v1.2.3