mirror of
https://github.com/znc/znc.git
synced 2026-08-01 06:23:32 +02:00
Merged rev 838,888,890,894,899,900,902-904,926,934,963,984-989 from crox's branch:
- Changes to specfile - define PATH_MAX and RTLD_LOCAL if not defines - compile fixes - SetFileName should not set m_iFD - check for cygwin and do not use -fPIC - replaced if ... elif with case in configure.in - handle 437 reply code - allow disabled channels - use strerror() in CIRCSock::SockError() - added GetUser() to CClient and CIRCSock - added support for traffic accounting - added names to timers git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@806 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -21,8 +21,10 @@ CChan::CChan(const CString& sName, CUser* pUser, bool bInConfig) {
|
||||
m_bDetached = false;
|
||||
m_uBufferCount = m_pUser->GetBufferCount();
|
||||
m_bKeepBuffer = m_pUser->KeepBuffer();
|
||||
m_bDisabled = false;
|
||||
Reset();
|
||||
}
|
||||
|
||||
CChan::~CChan() {
|
||||
ClearNicks();
|
||||
}
|
||||
@@ -155,7 +157,7 @@ CString CChan::GetModeString() const {
|
||||
}
|
||||
}
|
||||
|
||||
return (sModes.empty()) ? sModes : ("+" + sModes + sArgs);
|
||||
return sModes.empty() ? sModes : CString("+" + sModes + sArgs);
|
||||
}
|
||||
|
||||
CString CChan::GetModeForNames() const {
|
||||
|
||||
Reference in New Issue
Block a user