From 82ae452fff08430d514f762f49e78fec90f88625 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 17 Mar 2013 15:06:11 +0000
Subject: - rest of memory leaks - code cleaning;

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

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

diff --git a/plugins/SecureIM/src/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp
index 4d91ab8f8d..6f217273c1 100644
--- a/plugins/SecureIM/src/crypt_popups.cpp
+++ b/plugins/SecureIM/src/crypt_popups.cpp
@@ -41,32 +41,32 @@ void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) {
 	DBVARIANT dbv_timeout;
 
 	if (type==0) {
-		colorBack=DBGetContactSettingDword(0,szModuleName,"colorKeyb",(UINT)-1);
-		colorText=DBGetContactSettingDword(0,szModuleName,"colorKeyt",(UINT)-1);
+		colorBack=DBGetContactSettingDword(0,MODULENAME,"colorKeyb",(UINT)-1);
+		colorText=DBGetContactSettingDword(0,MODULENAME,"colorKeyt",(UINT)-1);
 		if (colorBack==(UINT)-1) colorBack=colorBackKey;
 		if (colorText==(UINT)-1) colorText=colorTextKey;
 
-		res=DBGetContactSetting(0,szModuleName,"timeoutKey",&dbv_timeout);
+		res=DBGetContactSetting(0,MODULENAME,"timeoutKey",&dbv_timeout);
 		if (res==0) timeout=atoi(dbv_timeout.pszVal);
 		DBFreeVariant(&dbv_timeout);
 	}
 	else if (type==1) {
-		colorBack=DBGetContactSettingDword(0,szModuleName,"colorSecb",(UINT)-1);
-		colorText=DBGetContactSettingDword(0,szModuleName,"colorSect",(UINT)-1);
+		colorBack=DBGetContactSettingDword(0,MODULENAME,"colorSecb",(UINT)-1);
+		colorText=DBGetContactSettingDword(0,MODULENAME,"colorSect",(UINT)-1);
 		if (colorBack==(UINT)-1) colorBack=colorBackSec;
 		if (colorText==(UINT)-1) colorText=colorTextSec;
 
-		res=DBGetContactSetting(0,szModuleName,"timeoutSec",&dbv_timeout);
+		res=DBGetContactSetting(0,MODULENAME,"timeoutSec",&dbv_timeout);
 		if (res==0) timeout=atoi(dbv_timeout.pszVal);
 		DBFreeVariant(&dbv_timeout);
 	}
 	else if (type>=2) {
-		colorBack=DBGetContactSettingDword(0, szModuleName, "colorSRb", (UINT)-1);
-		colorText=DBGetContactSettingDword(0, szModuleName, "colorSRt", (UINT)-1);
+		colorBack=DBGetContactSettingDword(0, MODULENAME, "colorSRb", (UINT)-1);
+		colorText=DBGetContactSettingDword(0, MODULENAME, "colorSRt", (UINT)-1);
 		if (colorBack==(UINT)-1) colorBack=colorBackSR;
 		if (colorText==(UINT)-1) colorText=colorTextSR;
 
-		res=DBGetContactSetting(0,szModuleName,"timeoutSR",&dbv_timeout);
+		res=DBGetContactSetting(0,MODULENAME,"timeoutSR",&dbv_timeout);
 		if (res==0) timeout=atoi(dbv_timeout.pszVal);
 		DBFreeVariant(&dbv_timeout);
 	}
@@ -90,36 +90,36 @@ void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) {
 
 
 void showPopUpDCmsg(HANDLE hContact,LPCSTR msg) {
-	int indic=db_get_b(0, szModuleName, "dc",1);
+	int indic=db_get_b(0, MODULENAME, "dc",1);
 	if (indic==1) showPopUp(msg,hContact,g_hPOP[POP_PU_DIS],1);
 }
 void showPopUpDC(HANDLE hContact) {
-	int indic=db_get_b(0, szModuleName, "dc",1);
+	int indic=db_get_b(0, MODULENAME, "dc",1);
 	if (indic==1) showPopUp(sim006,hContact,g_hPOP[POP_PU_DIS],1);
 }
 void showPopUpEC(HANDLE hContact) {
-	int indic=db_get_b(0, szModuleName, "ec",1);
+	int indic=db_get_b(0, MODULENAME, "ec",1);
 	if (indic==1) showPopUp(sim001,hContact,g_hPOP[POP_PU_EST],1);
 }
 void showPopUpKS(HANDLE hContact) {
-	int indic=db_get_b(0, szModuleName, "ks",1);
+	int indic=db_get_b(0, MODULENAME, "ks",1);
 	if (indic==1) showPopUp(sim007,hContact,g_hPOP[POP_PU_PRC],0);
 }
 void showPopUpKRmsg(HANDLE hContact,LPCSTR msg) {
-	int indic=db_get_b(0, szModuleName, "kr",1);
+	int indic=db_get_b(0, MODULENAME, "kr",1);
 	if (indic==1) showPopUp(msg,hContact,g_hPOP[POP_PU_PRC],0);
 }
 void showPopUpKR(HANDLE hContact) {
-	int indic=db_get_b(0, szModuleName, "kr",1);
+	int indic=db_get_b(0, MODULENAME, "kr",1);
 	if (indic==1) showPopUp(sim008,hContact,g_hPOP[POP_PU_PRC],0);
 }
 void showPopUpSM(HANDLE hContact) {
-	int indic=db_get_b(0, szModuleName, "ss",0);
+	int indic=db_get_b(0, MODULENAME, "ss",0);
 	if (indic==1) showPopUp(sim009,hContact,g_hPOP[POP_PU_MSS],2);
 	SkinPlaySound("OutgoingSecureMessage");
 }
 void showPopUpRM(HANDLE hContact) {
-	int indic=db_get_b(0, szModuleName, "sr",0);
+	int indic=db_get_b(0, MODULENAME, "sr",0);
 	if (indic==1) showPopUp(sim010,hContact,g_hPOP[POP_PU_MSR],2);
 	SkinPlaySound("IncomingSecureMessage");
 }
-- 
cgit v1.2.3