From ae0d0937e2752e8e0cab61a9712cfd1f6df8788b Mon Sep 17 00:00:00 2001
From: Chris Tyrrel <me@christyrrel.me>
Date: Thu, 13 Aug 2015 01:10:11 -0600
Subject: [PATCH] controlpanel: renamed chan setting 'buffer' to 'buffersize'

close #1029
---
 modules/controlpanel.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/controlpanel.cpp b/modules/controlpanel.cpp
index eeec04be..952a301b 100644
--- a/modules/controlpanel.cpp
+++ b/modules/controlpanel.cpp
@@ -130,7 +130,7 @@ class CAdminMod : public CModule {
 			static const char* cvars[][2] = {
 				{"DefModes",            str},
 				{"Key",                 str},
-				{"Buffer",              integer},
+				{"BufferSize",          integer},
 				{"InConfig",            boolean},
 				{"AutoClearChanBuffer", boolean},
 				{"Detached",            boolean}
@@ -704,12 +704,12 @@ class CAdminMod : public CModule {
 		for (CChan* pChan : vChans) {
 			if (sVar == "defmodes") {
 				PutModule(pChan->GetName() + ": DefModes = " + pChan->GetDefaultModes());
-			} else if (sVar == "buffer") {
+			} else if (sVar == "buffersize" || sVar == "buffer") {
 				CString sValue(pChan->GetBufferCount());
 				if (!pChan->HasBufferCountSet()) {
 					sValue += " (default)";
 				}
-				PutModule(pChan->GetName() + ": Buffer = " + sValue);
+				PutModule(pChan->GetName() + ": BufferSize = " + sValue);
 			} else if (sVar == "inconfig") {
 				PutModule(pChan->GetName() + ": InConfig = " + CString(pChan->InConfig()));
 			} else if (sVar == "keepbuffer") {
@@ -762,14 +762,14 @@ class CAdminMod : public CModule {
 			if (sVar == "defmodes") {
 				pChan->SetDefaultModes(sValue);
 				PutModule(pChan->GetName() + ": DefModes = " + sValue);
-			} else if (sVar == "buffer") {
+			} else if (sVar == "buffersize" || sVar == "buffer") {
 				unsigned int i = sValue.ToUInt();
 				if (sValue.Equals("-")) {
 					pChan->ResetBufferCount();
-					PutModule(pChan->GetName() + ": Buffer = " + CString(pChan->GetBufferCount()));
+					PutModule(pChan->GetName() + ": BufferSize = " + CString(pChan->GetBufferCount()));
 				// Admins don't have to honour the buffer limit
 				} else if (pChan->SetBufferCount(i, GetUser()->IsAdmin())) {
-					PutModule(pChan->GetName() + ": Buffer = " + sValue);
+					PutModule(pChan->GetName() + ": BufferSize = " + sValue);
 				} else {
 					PutModule("Setting failed, limit is " +
 							CString(CZNC::Get().GetMaxBufferSize()));