From cd1192e01fe6672d28afbf0eb7be00514700418a Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey@alexeysokolov.co.cc>
Date: Sat, 17 Sep 2011 14:32:25 +0700
Subject: [PATCH] Honor per-network nick in awaynick and keepnick.

---
 modules/awaynick.cpp | 12 ++++++------
 modules/keepnick.cpp |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/awaynick.cpp b/modules/awaynick.cpp
index ce4e3a7c..3c22f9b9 100644
--- a/modules/awaynick.cpp
+++ b/modules/awaynick.cpp
@@ -35,7 +35,7 @@ private:
 		CIRCNetwork* pNetwork = m_Module.GetNetwork();
 
 		if (pNetwork->IsUserAttached() && pNetwork->IsIRCConnected()) {
-			CString sConfNick = pNetwork->GetUser()->GetNick();
+			CString sConfNick = pNetwork->GetNick();
 			m_Module.PutIRC("NICK " + sConfNick);
 		}
 	}
@@ -80,7 +80,7 @@ public:
 		CIRCSock* pIRCSock = m_pNetwork->GetIRCSock();
 
 		if (pIRCSock) {
-			CString sConfNick = m_pUser->GetNick();
+			CString sConfNick = m_pNetwork->GetNick();
 
 			if (pIRCSock->GetNick().Equals(m_sAwayNick.Left(pIRCSock->GetNick().length()))) {
 				RemTimer("BackNickTimer");
@@ -91,7 +91,7 @@ public:
 
 	virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick,
 			CString& sIdent, CString& sRealName) {
-		if (m_pUser && !m_pUser->IsUserAttached()) {
+		if (m_pNetwork && !m_pNetwork->IsUserAttached()) {
 			m_sAwayNick = m_sFormat;
 
 			// ExpandString doesn't know our nick yet, so do it by hand.
@@ -114,7 +114,7 @@ public:
 	}
 
 	virtual void OnClientDisconnect() {
-		if (!m_pUser->IsUserAttached()) {
+		if (!m_pNetwork->IsUserAttached()) {
 			StartAwayNickTimer();
 		}
 	}
@@ -132,7 +132,7 @@ public:
 				SetNV("nick", m_sFormat);
 			}
 
-			if (m_pUser) {
+			if (m_pNetwork) {
 				CString sExpanded = GetAwayNick();
 				CString sMsg = "AwayNick is set to [" + m_sFormat + "]";
 
@@ -143,7 +143,7 @@ public:
 				PutModule(sMsg);
 			}
 		} else if (sCommand.Equals("SHOW")) {
-			if (m_pUser) {
+			if (m_pNetwork) {
 				CString sExpanded = GetAwayNick();
 				CString sMsg = "AwayNick is set to [" + m_sFormat + "]";
 
diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp
index c85e95bb..6894f4a0 100644
--- a/modules/keepnick.cpp
+++ b/modules/keepnick.cpp
@@ -58,7 +58,7 @@ public:
 	}
 
 	CString GetNick() {
-		CString sConfNick = m_pUser->GetNick();
+		CString sConfNick = m_pNetwork->GetNick();
 		CIRCSock* pIRCSock = m_pNetwork->GetIRCSock();
 
 		if (pIRCSock)