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/database/dbini.cpp   | 6 +++---
 src/modules/database/dbutils.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/modules/database')

diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp
index 442bd35567..a23726f133 100644
--- a/src/modules/database/dbini.cpp
+++ b/src/modules/database/dbini.cpp
@@ -322,7 +322,7 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf
 			break;
 		case 'w':
 		case 'W':
-			DBWriteContactSettingWord(NULL, szSection, szName, (WORD)strtol(szValue+1, NULL, 0));
+			db_set_w(NULL, szSection, szName, (WORD)strtol(szValue+1, NULL, 0));
 			break;
 		case 'd':
 		case 'D':
@@ -330,7 +330,7 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf
 			break;
 		case 'l':
 		case 'L':
-			DBDeleteContactSetting(NULL, szSection, szName);
+			db_unset(NULL, szSection, szName);
 			break;
 		case 'e':
 		case 'E':
@@ -357,7 +357,7 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf
 			}
 		case 'u':
 		case 'U':
-			DBWriteContactSettingStringUtf(NULL, szSection, szName, szValue+1);
+			db_set_utf(NULL, szSection, szName, szValue+1);
 			break;
 		case 'n':
 		case 'h':
diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp
index 9f70e1abec..4e88e1fcce 100644
--- a/src/modules/database/dbutils.cpp
+++ b/src/modules/database/dbutils.cpp
@@ -229,7 +229,7 @@ static INT_PTR DbDeleteModule(WPARAM, LPARAM lParam)
 	CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces);
 
 	for (int i = vars.getCount()-1; i >= 0; i--) {
-		DBDeleteContactSetting(NULL, (char*)lParam, vars[i]);
+		db_unset(NULL, (char*)lParam, vars[i]);
 		mir_free(vars[i]);
 	}
 	vars.destroy();
-- 
cgit v1.2.3