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
---
 src/modules/netlib/netlib.cpp     | 8 ++++----
 src/modules/netlib/netliblog.cpp  | 6 +++---
 src/modules/netlib/netlibopts.cpp | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/modules/netlib')

diff --git a/src/modules/netlib/netlib.cpp b/src/modules/netlib/netlib.cpp
index 5758824627..f3ba8e0e12 100644
--- a/src/modules/netlib/netlib.cpp
+++ b/src/modules/netlib/netlib.cpp
@@ -103,8 +103,8 @@ void NetlibLeaveNestedCS(struct NetlibNestedCriticalSection *nlncs)
 static INT_PTR GetNetlibUserSettingInt(const char *szUserModule, const char *szSetting, int defValue)
 {
 	DBVARIANT dbv;
-	if (DBGetContactSetting(NULL, szUserModule, szSetting, &dbv)
-	   && DBGetContactSetting(NULL, "Netlib", szSetting, &dbv))
+	if (db_get(NULL, szUserModule, szSetting, &dbv)
+	   && db_get(NULL, "Netlib", szSetting, &dbv))
 		return defValue;
 	if (dbv.type == DBVT_BYTE) return dbv.bVal;
 	if (dbv.type == DBVT_WORD) return dbv.wVal;
@@ -114,8 +114,8 @@ static INT_PTR GetNetlibUserSettingInt(const char *szUserModule, const char *szS
 static char *GetNetlibUserSettingString(const char *szUserModule, const char *szSetting, int decode)
 {
 	DBVARIANT dbv;
-	if (DBGetContactSettingString(NULL, szUserModule, szSetting, &dbv)
-	   && DBGetContactSettingString(NULL, "Netlib", szSetting, &dbv)) {
+	if (db_get_s(NULL, szUserModule, szSetting, &dbv)
+	   && db_get_s(NULL, "Netlib", szSetting, &dbv)) {
 		return NULL;
 	}
 	else {
diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp
index 76331b51e3..b8567a494f 100644
--- a/src/modules/netlib/netliblog.cpp
+++ b/src/modules/netlib/netliblog.cpp
@@ -90,7 +90,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa
 		CheckDlgButton(hwndDlg, IDC_SHOWTHISDLGATSTART, db_get_b(NULL, "Netlib", "ShowLogOptsAtStart", 0)?BST_CHECKED:BST_UNCHECKED);
 		{
 			DBVARIANT dbv;
-			if ( !DBGetContactSettingString(NULL, "Netlib", "RunAtStart", &dbv)) {
+			if ( !db_get_s(NULL, "Netlib", "RunAtStart", &dbv)) {
 				SetDlgItemTextA(hwndDlg, IDC_RUNATSTART, dbv.pszVal);
 				db_free(&dbv);
 			}
@@ -563,7 +563,7 @@ void NetlibLogInit(void)
 	logOptions.toFile = db_get_b(NULL, "Netlib", "ToFile", 0);
 	logOptions.toLog = db_get_dw(NULL, "Netlib", "NLlog", 1);
 
-	if ( !DBGetContactSettingTString(NULL, "Netlib", "File", &dbv)) {
+	if ( !db_get_ts(NULL, "Netlib", "File", &dbv)) {
 		logOptions.szUserFile = mir_tstrdup(dbv.ptszVal);
 
 		TCHAR path[MAX_PATH];
@@ -587,7 +587,7 @@ void NetlibLogInit(void)
 	if (db_get_b(NULL, "Netlib", "ShowLogOptsAtStart", 0))
 		NetlibLogShowOptions();
 
-	if ( !DBGetContactSettingTString(NULL, "Netlib", "RunAtStart", &dbv)) {
+	if ( !db_get_ts(NULL, "Netlib", "RunAtStart", &dbv)) {
 		STARTUPINFO si = { 0 };
 		PROCESS_INFORMATION pi;
 		si.cb = sizeof(si);
diff --git a/src/modules/netlib/netlibopts.cpp b/src/modules/netlib/netlibopts.cpp
index 49be304e5b..b165f55156 100644
--- a/src/modules/netlib/netlibopts.cpp
+++ b/src/modules/netlib/netlibopts.cpp
@@ -201,7 +201,7 @@ static void WriteSettingsStructToDb(const char *szSettingsModule, NETLIBUSERSETT
 		db_set_b(NULL, szSettingsModule, "NLUseProxy", (BYTE)settings->useProxy);
 		db_set_b(NULL, szSettingsModule, "NLProxyType", (BYTE)settings->proxyType);
 		db_set_s(NULL, szSettingsModule, "NLProxyServer", settings->szProxyServer?settings->szProxyServer:"");
-		DBWriteContactSettingWord(NULL, szSettingsModule, "NLProxyPort", (WORD)settings->wProxyPort);
+		db_set_w(NULL, szSettingsModule, "NLProxyPort", (WORD)settings->wProxyPort);
 		db_set_b(NULL, szSettingsModule, "NLUseProxyAuth", (BYTE)settings->useProxyAuth);
 		db_set_s(NULL, szSettingsModule, "NLProxyAuthUser", settings->szProxyAuthUser?settings->szProxyAuthUser:"");
 		lstrcpynA(szEncodedPassword, settings->szProxyAuthPassword?settings->szProxyAuthPassword:"", SIZEOF(szEncodedPassword));
-- 
cgit v1.2.3