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
---
 protocols/MSN/src/msn_misc.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'protocols/MSN/src/msn_misc.cpp')

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index f39fe781c0..9e110b8fd0 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -435,7 +435,7 @@ void  CMsnProto::MSN_GetCustomSmileyFileName(HANDLE hContact, TCHAR* pszDest, si
 		}
 
 		tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s"), dbv.ptszVal);
-		DBFreeVariant(&dbv);
+		db_free(&dbv);
 	}
 	else {
 		TCHAR *tszModuleName = mir_a2t(m_szModuleName);
@@ -520,7 +520,7 @@ int ThreadData::sendMessage(int msgType, const char* email, int netId, const cha
 			char* p;
 
 			DBVARIANT dbv;
-			if (!DBGetContactSettingString(NULL, "SRMsg", "Font0", &dbv)) {
+			if (!db_get_s(NULL, "SRMsg", "Font0", &dbv)) {
 				for (p = dbv.pszVal; *p; p++)
 					if (BYTE(*p) >= 128 || *p < 32)
 						break;
@@ -531,13 +531,13 @@ int ThreadData::sendMessage(int msgType, const char* email, int netId, const cha
 				}
 			}
 
-			int  tStyle = DBGetContactSettingByte(NULL, "SRMsg", "Font0Sty", 0);
+			int  tStyle = db_get_b(NULL, "SRMsg", "Font0Sty", 0);
 			p = tFontStyle;
 			if (tStyle & 1) *p++ = 'B';
 			if (tStyle & 2) *p++ = 'I';
 			*p = 0;
 
-			tFontColor = DBGetContactSettingDword(NULL, "SRMsg", "Font0Col", 0);
+			tFontColor = db_get_dw(NULL, "SRMsg", "Font0Col", 0);
 		}
 		else {
 			tFontColor = 0;
@@ -849,7 +849,7 @@ void  CMsnProto::MSN_SetServerStatus(int newStatus)
 		}
 
 		msnNsThread->sendPacket("CHG", "%s %u:%u %s", szStatusName, myFlags, myFlagsEx, msnObject.pszVal ? msnObject.pszVal : "0");
-		DBFreeVariant(&msnObject);
+		db_free(&msnObject);
 	}
 	else msnNsThread->sendPacket("CHG", szStatusName);
 }
-- 
cgit v1.2.3