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/options/options.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/modules/options/options.cpp')

diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp
index 7c49a8c973..881258106e 100644
--- a/src/modules/options/options.cpp
+++ b/src/modules/options/options.cpp
@@ -687,13 +687,13 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
 
 			dat->currentPage = -1;
 			if (ood->pszPage == NULL) {
-				if ( !DBGetContactSettingTString(NULL, "Options", "LastPage", &dbv)) {
+				if ( !db_get_ts(NULL, "Options", "LastPage", &dbv)) {
 					lastPage = mir_tstrdup(dbv.ptszVal);
 					db_free(&dbv);
 				}
 
 				if (ood->pszGroup == NULL) {
-					if ( !DBGetContactSettingTString(NULL, "Options", "LastGroup", &dbv)) {
+					if ( !db_get_ts(NULL, "Options", "LastGroup", &dbv)) {
 						lastGroup = mir_tstrdup(dbv.ptszVal);
 						db_free(&dbv);
 					}
@@ -706,7 +706,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
 			}
 
 			if (ood->pszTab == NULL) {
-				if ( !DBGetContactSettingTString(NULL, "Options", "LastTab", &dbv)) {
+				if ( !db_get_ts(NULL, "Options", "LastTab", &dbv)) {
 					lastTab = mir_tstrdup(dbv.ptszVal);
 					db_free(&dbv);
 				}
@@ -1192,17 +1192,17 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
 			if (opd->ptszTab)
 				db_set_ts(NULL, "Options", "LastTab", opd->ptszTab);
 			else
-				DBDeleteContactSetting(NULL, "Options", "LastTab");
+				db_unset(NULL, "Options", "LastTab");
 			if (opd->ptszGroup)
 				db_set_ts(NULL, "Options", "LastGroup", opd->ptszGroup);
 			else
-				DBDeleteContactSetting(NULL, "Options", "LastGroup");
+				db_unset(NULL, "Options", "LastGroup");
 			db_set_ts(NULL, "Options", "LastPage", opd->ptszTitle);
 		}
 		else {
-			DBDeleteContactSetting(NULL, "Options", "LastTab");
-			DBDeleteContactSetting(NULL, "Options", "LastGroup");
-			DBDeleteContactSetting(NULL, "Options", "LastPage");
+			db_unset(NULL, "Options", "LastTab");
+			db_unset(NULL, "Options", "LastGroup");
+			db_unset(NULL, "Options", "LastPage");
 		}
 
 		Utils_SaveWindowPosition(hdlg, NULL, "Options", "");
-- 
cgit v1.2.3