- 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

10 files changed, 63 insertions, 63 deletions

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index c86c1779f8..0d161f53cb 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -683,7 +683,7 @@ void CMsnProto::sttProcessYFind(char* buf, size_t len)
 				MSN_AddUser(hContact, szEmail, netId, LIST_PL + LIST_REMOVE);

 				MSN_AddUser(hContact, szEmail, netId, LIST_BL + LIST_REMOVE);

 				MSN_AddUser(hContact, szEmail, netId, LIST_AL);

-				DBDeleteContactSetting(hContact, "CList", "Hidden");

+				db_unset(hContact, "CList", "Hidden");

 			}

 			MSN_SetContactDb(hContact, szEmail);

 		}

@@ -822,9 +822,9 @@ void CMsnProto::sttProcessStatusMessage(char* buf, unsigned len, const char* wli
 	{

 		stripBBCode((char*)szStatMsg);

 		stripColorCode((char*)szStatMsg);

-		DBWriteContactSettingStringUtf(hContact, "CList", "StatusMsg", szStatMsg);

+		db_set_utf(hContact, "CList", "StatusMsg", szStatMsg);

 	}

-	else DBDeleteContactSetting(hContact, "CList", "StatusMsg");

+	else db_unset(hContact, "CList", "StatusMsg");

 

 	{

 		mir_ptr<TCHAR> tszStatus( mir_utf8decodeT(szStatMsg));

@@ -1365,7 +1365,7 @@ LBL_InvalidCommand:
 				setStringUtf(hContact, "Nick", data.userNick);

 				lastStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);

 				if (lastStatus == ID_STATUS_OFFLINE || lastStatus == ID_STATUS_INVISIBLE)

-					DBDeleteContactSetting(hContact, "CList", "StatusMsg");

+					db_unset(hContact, "CList", "StatusMsg");

 

 				int newStatus = MSNStatusToMiranda(params);

 				setWord(hContact, "Status",  newStatus != ID_STATUS_IDLE ? newStatus : ID_STATUS_AWAY);

diff --git a/protocols/MSN/src/msn_contact.cpp b/protocols/MSN/src/msn_contact.cpp
index d860b1d8e5..f1848a738e 100644
--- a/protocols/MSN/src/msn_contact.cpp
+++ b/protocols/MSN/src/msn_contact.cpp
@@ -40,7 +40,7 @@ HANDLE  CMsnProto::MSN_HContactFromEmail(const char* wlid, const char* msnNick,
 		setString(hContact, "e-mail", szEmail);

 		setStringUtf(hContact, "Nick", msnNick ? msnNick : wlid);

 		if (temporary)

-			DBWriteContactSettingByte(hContact, "CList", "NotOnList", 1);

+			db_set_b(hContact, "CList", "NotOnList", 1);

 

 		Lists_Add(0, NETID_MSN, wlid, hContact);

 	}

@@ -56,10 +56,10 @@ void CMsnProto::MSN_SetContactDb(HANDLE hContact, const char *szEmail)
 

 	if (listId & LIST_FL)

 	{

-		if (DBGetContactSettingByte(hContact, "CList", "NotOnList", 0) == 1)

+		if (db_get_b(hContact, "CList", "NotOnList", 0) == 1)

 		{

-			DBDeleteContactSetting(hContact, "CList", "NotOnList");

-			DBDeleteContactSetting(hContact, "CList", "Hidden");

+			db_unset(hContact, "CList", "NotOnList");

+			db_unset(hContact, "CList", "Hidden");

 		}

 

 		if (listId & (LIST_BL | LIST_AL))

@@ -185,7 +185,7 @@ bool CMsnProto::MSN_AddUser(HANDLE hContact, const char* email, int netId, int f
 			if (res)

 			{

 				DBVARIANT dbv;

-				if (!DBGetContactSettingStringUtf(hContact, "CList", "Group", &dbv))

+				if (!db_get_utf(hContact, "CList", "Group", &dbv))

 				{

 					MSN_MoveContactToGroup(hContact, dbv.pszVal);

 					MSN_FreeVariant(&dbv);

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 0c36aa4c65..fa11d889eb 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -420,6 +420,6 @@ void CMsnProto::displayEmailCount(HANDLE hContact)
 		getByte("DisableHotmailJunk", 0) ? _T("%s [%d]") : _T("%s [%d][%d]"), name, mUnreadMessages, mUnreadJunkEmails);

 

 	nickChg = true;

-	DBWriteContactSettingTString(hContact, "CList", "MyHandle", szNick);

+	db_set_ts(hContact, "CList", "MyHandle", szNick);

 	nickChg = false;

 }

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);

 }

diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index 2acbb835b1..644fddaa6e 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
@@ -435,8 +435,8 @@ static INT_PTR CALLBACK DlgProcMsnConnOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 			proto->setByte("SlowSend",   (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SLOWSEND ));

 			if (proto->getByte("SlowSend", FALSE))

 			{

-				if (DBGetContactSettingDword(NULL, "SRMsg", "MessageTimeout", 60000) < 60000 ||

-					DBGetContactSettingDword(NULL, "SRMM",  "MessageTimeout", 60000) < 60000)

+				if (db_get_dw(NULL, "SRMsg", "MessageTimeout", 60000) < 60000 ||

+					db_get_dw(NULL, "SRMM",  "MessageTimeout", 60000) < 60000)

 				{

 					MessageBox(NULL, TranslateT("MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value."),

 						TranslateT("MSN Protocol"), MB_OK|MB_ICONINFORMATION);

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 8df8e48531..04a079bfd3 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -114,10 +114,10 @@ CMsnProto::CMsnProto(const char* aProtoName, const TCHAR* aUserName) :
 

 	if (MyOptions.SlowSend)

 	{

-		if (DBGetContactSettingDword(NULL, "SRMsg", "MessageTimeout", 10000) < 60000)

-			DBWriteContactSettingDword(NULL, "SRMsg", "MessageTimeout", 60000);

-		if (DBGetContactSettingDword(NULL, "SRMM", "MessageTimeout", 10000) < 60000)

-			DBWriteContactSettingDword(NULL, "SRMM", "MessageTimeout", 60000);

+		if (db_get_dw(NULL, "SRMsg", "MessageTimeout", 10000) < 60000)

+			db_set_dw(NULL, "SRMsg", "MessageTimeout", 60000);

+		if (db_get_dw(NULL, "SRMM", "MessageTimeout", 10000) < 60000)

+			db_set_dw(NULL, "SRMM", "MessageTimeout", 60000);

 	}

 

 	mailsoundname = (char*)mir_alloc(64);

@@ -244,12 +244,12 @@ HANDLE CMsnProto::AddToListByEmail(const char *email, const char *nick, DWORD fl
 

 	if (flags & PALF_TEMPORARY)

 	{

-		if (DBGetContactSettingByte(hContact, "CList", "NotOnList", 0) == 1)

-			DBWriteContactSettingByte(hContact, "CList", "Hidden", 1);

+		if (db_get_b(hContact, "CList", "NotOnList", 0) == 1)

+			db_set_b(hContact, "CList", "Hidden", 1);

 	}

 	else

 	{

-		DBDeleteContactSetting(hContact, "CList", "Hidden");

+		db_unset(hContact, "CList", "Hidden");

 		if (msnLoggedIn)

 		{

 //			int netId = Lists_GetNetId(email);

@@ -260,7 +260,7 @@ HANDLE CMsnProto::AddToListByEmail(const char *email, const char *nick, DWORD fl
 				MSN_AddUser(hContact, email, netId, LIST_PL + LIST_REMOVE);

 				MSN_AddUser(hContact, email, netId, LIST_BL + LIST_REMOVE);

 				MSN_AddUser(hContact, email, netId, LIST_AL);

-				DBDeleteContactSetting(hContact, "CList", "Hidden");

+				db_unset(hContact, "CList", "Hidden");

 			}

 			MSN_SetContactDb(hContact, email);

 

@@ -681,7 +681,7 @@ void __cdecl CMsnProto::MsnGetAwayMsgThread(void* arg)
 

 	AwayMsgInfo *inf = (AwayMsgInfo*)arg;

 	DBVARIANT dbv;

-	if (!DBGetContactSettingTString(inf->hContact, "CList", "StatusMsg", &dbv)) {

+	if (!db_get_ts(inf->hContact, "CList", "StatusMsg", &dbv)) {

 		SendBroadcast(inf->hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)inf->id, (LPARAM)dbv.ptszVal);

 		MSN_FreeVariant(&dbv);

 	}

@@ -771,7 +771,7 @@ int __cdecl CMsnProto::RecvMsg(HANDLE hContact, PROTORECVEVENT* pre)
 	getStaticString(hContact, "e-mail", tEmail, sizeof(tEmail));

 

 	if (Lists_IsInList(LIST_FL, tEmail))

-		DBDeleteContactSetting(hContact, "CList", "Hidden");

+		db_unset(hContact, "CList", "Hidden");

 

 	return Proto_RecvMessage(hContact, pre);

 }

diff --git a/protocols/MSN/src/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp
index c3ec9f6020..d0e1e6b32c 100644
--- a/protocols/MSN/src/msn_soapab.cpp
+++ b/protocols/MSN/src/msn_soapab.cpp
@@ -834,7 +834,7 @@ bool CMsnProto::MSN_ABFind(const char* szMethod, const char* szGuid, bool deltas
 						if (strcmp(ezxml_txt(ezxml_child(anot, "Name")), "AB.NickName") == 0)

 						{

 							szNick = ezxml_txt(ezxml_child(anot, "Value"));

-							DBWriteContactSettingStringUtf(hContact, "CList", "MyHandle", szNick);

+							db_set_utf(hContact, "CList", "MyHandle", szNick);

 						}

 						if (strcmp(ezxml_txt(ezxml_child(anot, "Name")), "AB.JobTitle") == 0)

 						{

@@ -844,7 +844,7 @@ bool CMsnProto::MSN_ABFind(const char* szMethod, const char* szGuid, bool deltas
 						anot = ezxml_next(anot);

 					}

 					if (szNick == NULL)

-						DBDeleteContactSetting(hContact, "CList", "MyHandle");

+						db_unset(hContact, "CList", "MyHandle");

 

 					setString(hContact, "ID", szContId);

 

@@ -893,8 +893,8 @@ bool CMsnProto::MSN_ABFind(const char* szMethod, const char* szGuid, bool deltas
 					}

 

 					szTmp = ezxml_txt(ezxml_child(contInf, "comment"));

-					if (*szTmp) DBWriteContactSettingString(hContact, "UserInfo", "MyNotes", szTmp);

-	//				else DBDeleteContactSetting(hContact, "UserInfo", "MyNotes");

+					if (*szTmp) db_set_s(hContact, "UserInfo", "MyNotes", szTmp);

+	//				else db_unset(hContact, "UserInfo", "MyNotes");

 

 					ezxml_t loc = ezxml_get(contInf, "locations", 0, "ContactLocation", -1);

 					while (loc != NULL)

diff --git a/protocols/MSN/src/msn_srv.cpp b/protocols/MSN/src/msn_srv.cpp
index 0f75491617..cbff0068a8 100644
--- a/protocols/MSN/src/msn_srv.cpp
+++ b/protocols/MSN/src/msn_srv.cpp
@@ -238,7 +238,7 @@ void  CMsnProto::MSN_UploadServerGroups(char* group)
 		if (msc == NULL) break;

 

 		DBVARIANT dbv;

-		if (!DBGetContactSettingStringUtf(msc->hContact, "CList", "Group", &dbv))

+		if (!db_get_utf(msc->hContact, "CList", "Group", &dbv))

 		{

 			char szGroupID[100];

 			if (group == NULL || (strcmp(group, dbv.pszVal) == 0 &&

@@ -263,12 +263,12 @@ void CMsnProto::MSN_SyncContactToServerGroup(HANDLE hContact, const char* szCont
 	const char* szGrpName = "";

 

 	DBVARIANT dbv;

-	if (!DBGetContactSettingStringUtf(hContact, "CList", "Group", &dbv))

+	if (!db_get_utf(hContact, "CList", "Group", &dbv))

 	{

 		if (strcmp(dbv.pszVal, "MetaContacts Hidden Group") == 0)

 		{

 			MSN_FreeVariant(&dbv);

-			if (!DBGetContactSettingStringUtf(hContact, "MetaContacts", "OldCListGroup", &dbv))

+			if (!db_get_utf(hContact, "MetaContacts", "OldCListGroup", &dbv))

 			{

 				szGrpName = NEWSTR_ALLOCA(dbv.pszVal);

 				MSN_FreeVariant(&dbv);

@@ -301,12 +301,12 @@ void CMsnProto::MSN_SyncContactToServerGroup(HANDLE hContact, const char* szCont
 		setString(hContact, "GroupID", szGrpIdF);

 		const char* szGrpNameById = MSN_GetGroupById(szGrpIdF);

 		if (strcmp(szGrpNameById, szGrpName))

-			DBWriteContactSettingStringUtf(hContact, "CList", "Group", szGrpNameById);

+			db_set_utf(hContact, "CList", "Group", szGrpNameById);

 	}

 	else

 	{

 		if (szGrpName[0])

-			DBDeleteContactSetting(hContact, "CList", "Group");

+			db_unset(hContact, "CList", "Group");

 		deleteSetting(hContact, "GroupID");

 	}

 }

diff --git a/protocols/MSN/src/msn_std.cpp b/protocols/MSN/src/msn_std.cpp
index d96e13d8fa..43532ec6a5 100644
--- a/protocols/MSN/src/msn_std.cpp
+++ b/protocols/MSN/src/msn_std.cpp
@@ -27,47 +27,47 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Standard functions

 

 void  CMsnProto::deleteSetting(HANDLE hContact, const char* valueName)

-{   DBDeleteContactSetting(hContact, m_szModuleName, valueName);

+{   db_unset(hContact, m_szModuleName, valueName);

 }

 

 int CMsnProto::getByte(const char* name, BYTE defaultValue)

-{	return DBGetContactSettingByte(NULL, m_szModuleName, name, defaultValue);

+{	return db_get_b(NULL, m_szModuleName, name, defaultValue);

 }

 

 int CMsnProto::getByte(HANDLE hContact, const char* name, BYTE defaultValue)

-{	return DBGetContactSettingByte(hContact, m_szModuleName, name, defaultValue);

+{	return db_get_b(hContact, m_szModuleName, name, defaultValue);

 }

 

 int CMsnProto::getDword(const char* name, DWORD defaultValue)

-{	return DBGetContactSettingDword(NULL, m_szModuleName, name, defaultValue);

+{	return db_get_dw(NULL, m_szModuleName, name, defaultValue);

 }

 

 int CMsnProto::getDword(HANDLE hContact, const char* name, DWORD defaultValue)

-{	return DBGetContactSettingDword(hContact, m_szModuleName, name, defaultValue);

+{	return db_get_dw(hContact, m_szModuleName, name, defaultValue);

 }

 

 int CMsnProto::getString(const char* name, DBVARIANT* result)

-{	return DBGetContactSettingString(NULL, m_szModuleName, name, result);

+{	return db_get_s(NULL, m_szModuleName, name, result);

 }

 

 int CMsnProto::getString(HANDLE hContact, const char* name, DBVARIANT* result)

-{	return DBGetContactSettingString(hContact, m_szModuleName, name, result);

+{	return db_get_s(hContact, m_szModuleName, name, result);

 }

 

 int CMsnProto::getTString(const char* name, DBVARIANT* result)

-{	return DBGetContactSettingTString(NULL, m_szModuleName, name, result);

+{	return db_get_ts(NULL, m_szModuleName, name, result);

 }

 

 int CMsnProto::getTString(HANDLE hContact, const char* name, DBVARIANT* result)

-{	return DBGetContactSettingTString(hContact, m_szModuleName, name, result);

+{	return db_get_ts(hContact, m_szModuleName, name, result);

 }

 

 int CMsnProto::getStringUtf(HANDLE hContact, const char* name, DBVARIANT* result)

-{	return DBGetContactSettingStringUtf(hContact, m_szModuleName, name, result);

+{	return db_get_utf(hContact, m_szModuleName, name, result);

 }

 

 int CMsnProto::getStringUtf(const char* name, DBVARIANT* result)

-{	return DBGetContactSettingStringUtf(NULL, m_szModuleName, name, result);

+{	return db_get_utf(NULL, m_szModuleName, name, result);

 }

 

 int  CMsnProto::getStaticString(HANDLE hContact, const char* valueName, char* dest, unsigned dest_len)

@@ -88,55 +88,55 @@ int  CMsnProto::getStaticString(HANDLE hContact, const char* valueName, char* de
 }

 

 WORD CMsnProto::getWord(const char* name, WORD defaultValue)

-{	return DBGetContactSettingWord(NULL, m_szModuleName, name, defaultValue);

+{	return db_get_w(NULL, m_szModuleName, name, defaultValue);

 }

 

 WORD CMsnProto::getWord(HANDLE hContact, const char* name, WORD defaultValue)

-{	return DBGetContactSettingWord(hContact, m_szModuleName, name, defaultValue);

+{	return db_get_w(hContact, m_szModuleName, name, defaultValue);

 }

 

 void CMsnProto::setByte(const char* name, BYTE value)

-{	DBWriteContactSettingByte(NULL, m_szModuleName, name, value);

+{	db_set_b(NULL, m_szModuleName, name, value);

 }

 

 void CMsnProto::setByte(HANDLE hContact, const char* name, BYTE value)

-{	DBWriteContactSettingByte(hContact, m_szModuleName, name, value);

+{	db_set_b(hContact, m_szModuleName, name, value);

 }

 

 void CMsnProto::setDword(const char* name, DWORD value)

-{	DBWriteContactSettingDword(NULL, m_szModuleName, name, value);

+{	db_set_dw(NULL, m_szModuleName, name, value);

 }

 

 void CMsnProto::setDword(HANDLE hContact, const char* name, DWORD value)

-{	DBWriteContactSettingDword(hContact, m_szModuleName, name, value);

+{	db_set_dw(hContact, m_szModuleName, name, value);

 }

 

 void CMsnProto::setString(const char* name, const char* value)

-{	DBWriteContactSettingString(NULL, m_szModuleName, name, value);

+{	db_set_s(NULL, m_szModuleName, name, value);

 }

 

 void CMsnProto::setString(HANDLE hContact, const char* name, const char* value)

-{	DBWriteContactSettingString(hContact, m_szModuleName, name, value);

+{	db_set_s(hContact, m_szModuleName, name, value);

 }

 

 void CMsnProto::setStringUtf(HANDLE hContact, const char* name, const char* value)

-{	DBWriteContactSettingStringUtf(hContact, m_szModuleName, name, value);

+{	db_set_utf(hContact, m_szModuleName, name, value);

 }

 

 void CMsnProto::setTString(const char* name, const TCHAR* value)

-{	DBWriteContactSettingTString(NULL, m_szModuleName, name, value);

+{	db_set_ts(NULL, m_szModuleName, name, value);

 }

 

 void CMsnProto::setTString(HANDLE hContact, const char* name, const TCHAR* value)

-{	DBWriteContactSettingTString(hContact, m_szModuleName, name, value);

+{	db_set_ts(hContact, m_szModuleName, name, value);

 }

 

 void CMsnProto::setWord(const char* name, WORD value)

-{	DBWriteContactSettingWord(NULL, m_szModuleName, name, value);

+{	db_set_w(NULL, m_szModuleName, name, value);

 }

 

 void CMsnProto::setWord(HANDLE hContact, const char* name, WORD value)

-{	DBWriteContactSettingWord(hContact, m_szModuleName, name, value);

+{	db_set_w(hContact, m_szModuleName, name, value);

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -206,7 +206,7 @@ TCHAR* CMsnProto::GetContactNameT(HANDLE hContact)
 

 void MSN_FreeVariant(DBVARIANT* dbv)

 {

-	DBFreeVariant(dbv);

+	db_free(dbv);

 }

 

 char* MSN_Translate(const char* str)

diff --git a/protocols/MSN/src/msn_useropts.cpp b/protocols/MSN/src/msn_useropts.cpp
index 24b04705e0..ee7856fe9b 100644
--- a/protocols/MSN/src/msn_useropts.cpp
+++ b/protocols/MSN/src/msn_useropts.cpp
@@ -36,8 +36,8 @@ INT_PTR CALLBACK MsnDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 

 				const HANDLE hContact = (HANDLE)lParam;

 

-				SetDlgItemInt(hwndDlg, IDC_MOBILE, DBGetContactSettingByte(hContact, m_szModuleName, "MobileAllowed", 0), 0);

-				SetDlgItemInt(hwndDlg, IDC_MSN_MOBILE, DBGetContactSettingByte(hContact, m_szModuleName, "MobileEnabled", 0), 0);

+				SetDlgItemInt(hwndDlg, IDC_MOBILE, db_get_b(hContact, m_szModuleName, "MobileAllowed", 0), 0);

+				SetDlgItemInt(hwndDlg, IDC_MSN_MOBILE, db_get_b(hContact, m_szModuleName, "MobileEnabled", 0), 0);

 

 				DWORD dwFlagBits = setDword(hContact, "FlagBits", 0);

 				SetDlgItemTextA(hwndDlg, IDC_WEBMESSENGER, (dwFlagBits & 0x200) ? "Y" : "N");