From b0b7cd90e972155a488b017eae3122ca8ac11ca8 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 19 Nov 2012 15:22:11 +0000
Subject: - returned back SecureIM option for the extra icons usage; - code
 cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@2376 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SecureIM/src/main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/SecureIM/src/main.cpp')

diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 23ee788a76..de8015d342 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -238,10 +238,10 @@ int __cdecl onModulesLoaded(WPARAM wParam,LPARAM lParam) {
 #if defined(_DEBUG) || defined(NETLIB_LOG)
 	Sent_NetLog("pgp_init");
 #endif
-	bPGP = DBGetContactSettingByte(0, szModuleName, "pgp", 0);
+	bPGP = db_get_b(0, szModuleName, "pgp", 0);
 	if(bPGP) { //PGP
 	    bPGPloaded = pgp_init();
-   	    bUseKeyrings = DBGetContactSettingByte(0,szModuleName,"ukr",1);
+   	    bUseKeyrings = db_get_b(0,szModuleName,"ukr",1);
    	    LPSTR priv = myDBGetStringDecode(0,szModuleName,"pgpPrivKey");
    	    if(priv) {
 	   	    bPGPprivkey = true;
@@ -285,7 +285,7 @@ int __cdecl onModulesLoaded(WPARAM wParam,LPARAM lParam) {
 #if defined(_DEBUG) || defined(NETLIB_LOG)
 	Sent_NetLog("gpg_init");
 #endif
-	bGPG = DBGetContactSettingByte(0, szModuleName, "gpg", 0);
+	bGPG = db_get_b(0, szModuleName, "gpg", 0);
 	if(bGPG) { //GPG
 
 		LPSTR tmp;
@@ -306,7 +306,7 @@ int __cdecl onModulesLoaded(WPARAM wParam,LPARAM lParam) {
 			mir_free(tmp);
 		}
 
-		if(DBGetContactSettingByte(0, szModuleName, "gpgLogFlag",0)) {
+		if(db_get_b(0, szModuleName, "gpgLogFlag",0)) {
 			tmp = myDBGetString(0,szModuleName,"gpgLog");
 			if(tmp) {
 				gpg_set_log(tmp);
@@ -314,7 +314,7 @@ int __cdecl onModulesLoaded(WPARAM wParam,LPARAM lParam) {
 			}
 		}
 
-		if(DBGetContactSettingByte(0, szModuleName, "gpgTmpFlag",0)) {
+		if(db_get_b(0, szModuleName, "gpgTmpFlag",0)) {
 			tmp = myDBGetString(0,szModuleName,"gpgTmp");
 			if(tmp) {
 				gpg_set_tmp(tmp);
@@ -332,7 +332,7 @@ int __cdecl onModulesLoaded(WPARAM wParam,LPARAM lParam) {
 			DBDeleteContactSetting(0, szModuleName, "gpgHome");
 		}
 
-		bSavePass = DBGetContactSettingByte(0,szModuleName,"gpgSaveFlag",0);
+		bSavePass = db_get_b(0,szModuleName,"gpgSaveFlag",0);
 		if(bSavePass) {
 			tmp = myDBGetString(0,szModuleName,"gpgSave");
 			if(tmp) {
-- 
cgit v1.2.3