[ZNC-commits] SF.net SVN: znc:[1850] trunk

[<ps...@us...>]

Revision: 1850
          http://znc.svn.sourceforge.net/znc/?rev=1850&view=rev
Author:   psychon
Date:     2010-03-29 19:29:20 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
Oh look, invisible, pink unicorns!

No really, over there! You really should take a look. Come on, I'm not messing
with you. There really are those IPU (invisible pink unicorns) right behind you.
DarthGandalf found them. Oh, now they flew away. :(

Modified Paths:
--------------
    trunk/Modules.cpp
    trunk/znc.cpp

Modified: trunk/Modules.cpp
===================================================================
--- trunk/Modules.cpp	2010-03-29 19:23:48 UTC (rev 1849)
+++ trunk/Modules.cpp	2010-03-29 19:29:20 UTC (rev 1850)
@@ -546,7 +546,7 @@
 bool CModules::OnIRCConnecting(CIRCSock *pIRCSock) { MODHALTCHK(OnIRCConnecting(pIRCSock)); }
 bool CModules::OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) { MODHALTCHK(OnIRCRegistration(sPass, sNick, sIdent, sRealName)); }
 bool CModules::OnBroadcast(CString& sMessage) { MODHALTCHK(OnBroadcast(sMessage)); }
-bool CModules::OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan) { GLOBALMODHALTCHK(OnConfigLine(sName, sValue, pUser, pChan)); }
+bool CModules::OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan) { MODHALTCHK(OnConfigLine(sName, sValue, pUser, pChan)); }
 bool CModules::OnWriteUserConfig(CFile& Config) { MODUNLOADCHK(OnWriteUserConfig(Config)); return false; }
 bool CModules::OnWriteChanConfig(CFile& Config, CChan& Chan) { MODUNLOADCHK(OnWriteChanConfig(Config, Chan)); return false; }
 bool CModules::OnIRCDisconnected() { MODUNLOADCHK(OnIRCDisconnected()); return false; }

Modified: trunk/znc.cpp
===================================================================
--- trunk/znc.cpp	2010-03-29 19:23:48 UTC (rev 1849)
+++ trunk/znc.cpp	2010-03-29 19:29:20 UTC (rev 1850)
@@ -1676,7 +1676,7 @@
 		if (it->m_pUser) {
 			MODULECALL(OnConfigLine(it->m_sName, it->m_sValue, it->m_pUser, it->m_pChan), it->m_pUser, NULL, bHandled = true);
 		} else {
-			bHandled = GetModules().OnConfigLine(it->m_sName, it->m_sValue, it->m_pUser, it->m_pChan));
+			bHandled = GetModules().OnConfigLine(it->m_sName, it->m_sValue, it->m_pUser, it->m_pChan);
 		}
 		if (!bHandled) {
 			CUtils::PrintMessage("unhandled global module config line [GM:" + it->m_sName + "] = [" + it->m_sValue + "]");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.