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

(limited to 'plugins/Clist_nicer/src/extBackg.cpp')

diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 771e36bba0..a41f0f5ff6 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -522,7 +522,7 @@ void extbk_export(char *file)
 
 	if ( !cfg::getString(NULL, "CLC", "BkBitmap", &dbv)) {
 		WritePrivateProfileStringA("Global", "BkBitmap", dbv.pszVal, file);
-		DBFreeVariant(&dbv);
+		db_free(&dbv);
 	}
 }
 
@@ -1177,7 +1177,7 @@ void IMG_LoadItems()
 
 	WideCharToMultiByte(CP_ACP, 0, tszFileName, MAX_PATH, szFileName, MAX_PATH, 0, 0);
 
-	DBFreeVariant(&dbv);
+	db_free(&dbv);
 
 	if ( !PathFileExists(tszFileName))
 		return;
@@ -1273,14 +1273,14 @@ void LoadPerContactSkins(TCHAR *tszFileName)
 				if ((INT_PTR) uid != CALLSERVICE_NOTFOUND && uid != NULL) {
 					DBVARIANT dbv = {0};
 
-					DBGetContactSetting(hContact, szProto, uid, &dbv);
+					db_get(hContact, szProto, uid, &dbv);
 					switch(dbv.type) {
 					case DBVT_DWORD:
 						mir_snprintf(UIN, 40, "%d", dbv.dVal);
 						break;
 					case DBVT_ASCIIZ:
 						mir_snprintf(UIN, 40, "%s", dbv.pszVal);
-						DBFreeVariant(&dbv);
+						db_free(&dbv);
 						break;
 					default:
 						UIN[0] = 0;
@@ -1451,7 +1451,7 @@ static void ApplyCLUISkin()
 		SetWindowPos(pcli->hwndContactList, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
 		SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0);
 		RedrawWindow(pcli->hwndContactList, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_ERASE);
-		DBFreeVariant(&dbv);
+		db_free(&dbv);
 	}
 }
 
@@ -1484,7 +1484,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 
 			if ( !cfg::getString(NULL, "CLC", "ContactSkins", &dbv)) {
 				SetDlgItemTextA(hwndDlg, IDC_SKINFILE, dbv.pszVal);
-				DBFreeVariant(&dbv);
+				db_free(&dbv);
 				Utils::enableDlgControl(hwndDlg, IDC_RELOAD, TRUE);
 			}
 			else
@@ -1492,7 +1492,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			CheckDlgButton(hwndDlg, IDC_USESKIN, cfg::getByte("CLUI", "useskin", 0) ? BST_CHECKED : BST_UNCHECKED);
 			if ( !cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) {
 				SetDlgItemText(hwndDlg, IDC_SKINFILENAME, dbv.ptszVal);
-				DBFreeVariant(&dbv);
+				db_free(&dbv);
 			}
 			else
 				SetDlgItemText(hwndDlg, IDC_SKINFILENAME, _T(""));
@@ -1537,7 +1537,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 					if ( !cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) {
 						if (_tcscmp(dbv.ptszVal, final_path))
 							skinChanged = TRUE;
-						DBFreeVariant(&dbv);
+						db_free(&dbv);
 					}
 					else
 						skinChanged = TRUE;
-- 
cgit v1.2.3