From fd9ed4aff17b8712cf17e5fba937fdc8be21c131 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sat, 6 Feb 2010 14:54:06 +0000
Subject: [PATCH] Fix the OnKick() module call

This call works exactly as it did before (well, it no longer creates a
temporary CNick instance), but it's documentation now also describes its current
behavior.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1737 726aef4b-f618-498e-8847-2d620e286838
---
 IRCSock.cpp | 2 +-
 Modules.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IRCSock.cpp b/IRCSock.cpp
index 7cde49ce..89b23d84 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -507,7 +507,7 @@ void CIRCSock::ReadLine(const CString& sData) {
 
 			if (pChan) {
 				pChan->RemNick(sKickedNick);
-				MODULECALL(OnKick(Nick.GetNickMask(), sKickedNick, *pChan, sMsg), m_pUser, NULL, );
+				MODULECALL(OnKick(Nick, sKickedNick, *pChan, sMsg), m_pUser, NULL, );
 			}
 
 			if (GetNick().Equals(sKickedNick) && pChan) {
diff --git a/Modules.h b/Modules.h
index e7d27dab..05106311 100644
--- a/Modules.h
+++ b/Modules.h
@@ -381,12 +381,12 @@ public:
 	 */
 	virtual void OnNick(const CNick& Nick, const CString& sNewNick, const vector<CChan*>& vChans);
 	/** Called when a nick is kicked from a channel.
-	 *  @param Nick The nick which is kicked.
-	 *  @param sOpNick The nick which generated the kick.
+	 *  @param OpNick The nick which generated the kick.
+	 *  @param sKickedNick The nick which was kicked.
 	 *  @param Channel The channel on which this kick occurs.
 	 *  @param sMessage The kick message.
 	 */
-	virtual void OnKick(const CNick& Nick, const CString& sOpNick, CChan& Channel, const CString& sMessage);
+	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage);
 	/** Called when a nick joins a channel.
 	 *  @param Nick The nick who joined.
 	 *  @param Channel The channel which was joined.