Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2016-07-31 10:37:38 +01:00
4 changed files with 4 additions and 0 deletions

View File

@@ -31,6 +31,7 @@ void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, con
EModRet OnJoining(CChan& Channel)
void OnJoin(const CNick& Nick, CChan& Channel)
void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage)
EModRet OnInvite(const CNick& Nick, const CString& sChan)
EModRet OnChanBufferStarting(CChan& Chan, CClient& Client)
EModRet OnChanBufferEnding(CChan& Chan, CClient& Client)
EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine)

View File

@@ -102,6 +102,7 @@ class ZNC_EXPORT_LIB_EXPORT CPyModule : public CModule {
void OnJoin(const CNick& Nick, CChan& Channel) override;
void OnPart(const CNick& Nick, CChan& Channel,
const CString& sMessage) override;
void EModRet OnInvite(const CNick& Nick, const CString& sChan) override;
EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override;
EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override;
EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client,