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
---
 protocols/IRCG/src/ircproto.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'protocols/IRCG/src/ircproto.cpp')

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 95df8741a2..55566a75c0 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -196,7 +196,7 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM )
 	NETLIBUSER nlu = {0};
 	TCHAR name[128];
 
-	DBDeleteContactSetting( NULL, m_szModuleName, "JTemp" );
+	db_unset( NULL, m_szModuleName, "JTemp" );
 
 	nlu.cbSize = sizeof(nlu);
 	nlu.flags = NUF_OUTGOING|NUF_INCOMING|NUF_HTTPCONNS|NUF_TCHAR;
@@ -305,10 +305,10 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM )
 			String s = performToConvert[i];
 			DBVARIANT dbv;
 			if ( !getTString( s, &dbv )) {
-				DBDeleteContactSetting( NULL, m_szModuleName, s );
+				db_unset( NULL, m_szModuleName, s );
 				s.MakeUpper();
 				setTString( s, dbv.ptszVal );
-				DBFreeVariant( &dbv );
+				db_free( &dbv );
 		}	}
 
 		setByte( "PerformConversionDone", 1 );
@@ -362,7 +362,7 @@ HANDLE __cdecl CIrcProto::AddToList( int, PROTOSEARCHRESULT* psr )
 			if ( !getTString(hContact, "UWildcard", &dbv1 )) {
 				S += dbv1.ptszVal;
 				DoUserhostWithReason(2, S, true, dbv1.ptszVal);
-				DBFreeVariant( &dbv1 );
+				db_free( &dbv1 );
 			}
 			else {
 				S += user.name;
@@ -787,7 +787,7 @@ HANDLE __cdecl CIrcProto::SendFile( HANDLE hContact, const TCHAR*, TCHAR** ppszF
 				index++;
 			}
 
-			DBFreeVariant( &dbv );
+			db_free( &dbv );
 	}	}
 
 	if (dci)
@@ -953,14 +953,14 @@ HANDLE __cdecl CIrcProto::GetAwayMsg( HANDLE hContact )
 		if ( hContact && !getTString( hContact, "Nick", &dbv)) {
 			int i = getWord( hContact, "Status", ID_STATUS_OFFLINE );
 			if ( i != ID_STATUS_AWAY) {
-				DBFreeVariant( &dbv);
+				db_free( &dbv);
 				return 0;
 			}
 			CMString S = _T("WHOIS ");
 			S += dbv.ptszVal;
 			if (IsConnected())
 				SendIrcMessage( S.c_str(), false);
-			DBFreeVariant( &dbv);
+			db_free( &dbv);
 	}	}
 
 	return (HANDLE)1;
-- 
cgit v1.2.3