From 85c0b6a96f366bdf0ca334ee7cb1877fb3f2288c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 16 Jan 2015 17:49:54 +0000
Subject: MEVENT - the strict type for events, they are not HANDLE anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@11866 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IRCG/src/clist.cpp    | 4 ++--
 protocols/IRCG/src/irc.h        | 6 +++---
 protocols/IRCG/src/ircproto.cpp | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'protocols/IRCG/src')

diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index 3dd962a4a3..e52c1c50d7 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -64,7 +64,7 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask,
 	else {
 		CLISTEVENT cle = { sizeof(cle) };
 		cle.hContact = hContact;
-		cle.hDbEvent = (HANDLE)"dccchat";
+		cle.hDbEvent = -100;
 		cle.flags = CLEF_TCHAR;
 		cle.hIcon = LoadIconEx(IDI_DCC);
 		mir_snprintf(szService, SIZEOF(szService), "%s/DblClickEvent", m_szModuleName);
@@ -74,7 +74,7 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask,
 		cle.lParam = (LPARAM)pdci;
 
 		if (CallService(MS_CLIST_GETEVENT, hContact, 0))
-			CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM)"dccchat");
+			CallService(MS_CLIST_REMOVEEVENT, hContact, -100);
 		CallService(MS_CLIST_ADDEVENT, hContact, (LPARAM)&cle);
 	}
 	return TRUE;
diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h
index 68df80a0d8..991a01988d 100644
--- a/protocols/IRCG/src/irc.h
+++ b/protocols/IRCG/src/irc.h
@@ -212,10 +212,10 @@ struct CIrcProto : public PROTO<CIrcProto>
 				// Protocol interface
 
 	virtual	MCONTACT  __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );
-	virtual	MCONTACT  __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent );
+	virtual	MCONTACT  __cdecl AddToListByEvent( int flags, int iContact, MEVENT hDbEvent );
 
-	virtual	int       __cdecl Authorize(HANDLE hDbEvent);
-	virtual	int       __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR* szReason);
+	virtual	int       __cdecl Authorize(MEVENT hDbEvent);
+	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason);
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);
 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage);
 
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 9dfd53c061..0a259851c1 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -338,7 +338,7 @@ MCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)
 ////////////////////////////////////////////////////////////////////////////////////////
 // AddToList - adds a contact to the contact list
 
-MCONTACT __cdecl CIrcProto::AddToListByEvent(int, int, HANDLE)
+MCONTACT __cdecl CIrcProto::AddToListByEvent(int, int, MEVENT)
 {
 	return NULL;
 }
@@ -346,7 +346,7 @@ MCONTACT __cdecl CIrcProto::AddToListByEvent(int, int, HANDLE)
 ////////////////////////////////////////////////////////////////////////////////////////
 // AuthAllow - processes the successful authorization
 
-int __cdecl CIrcProto::Authorize(HANDLE)
+int __cdecl CIrcProto::Authorize(MEVENT)
 {
 	return 0;
 }
@@ -354,7 +354,7 @@ int __cdecl CIrcProto::Authorize(HANDLE)
 ////////////////////////////////////////////////////////////////////////////////////////
 // AuthDeny - handles the unsuccessful authorization
 
-int __cdecl CIrcProto::AuthDeny(HANDLE, const TCHAR*)
+int __cdecl CIrcProto::AuthDeny(MEVENT, const TCHAR*)
 {
 	return 0;
 }
-- 
cgit v1.2.3