From: Kyle Fuller <redacted>
Date: Sun, 5 Apr 2020 13:43:36 +0000 (+0100)
Subject: refactor: rename PALAVER_VERSION to module version
X-Git-Tag: 1.2.0~1
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b94f56ea0b4a205b8d794099bde3d1d05727eadf;p=znc-palaver.git

refactor: rename PALAVER_VERSION to module version

This prevents any confusion that it reflects Palaver application version.
---

diff --git a/palaver.cpp b/palaver.cpp
index 5a1d749..82d51fe 100644
--- a/palaver.cpp
+++ b/palaver.cpp
@@ -7,7 +7,7 @@
 
 #define REQUIRESSL
 
-#define PALAVER_VERSION "1.1.2"
+#define ZNC_PALAVER_VERSION "1.1.2"
 
 #include <znc/Modules.h>
 #include <znc/User.h>
@@ -104,7 +104,7 @@ public:
 
 		mcsHeaders["Connection"] = "close";
 		// as per https://tools.ietf.org/html/rfc7231#section-5.5.3
-		mcsHeaders["User-Agent"] = "znc-palaver/" + CString(PALAVER_VERSION) + " znc/" + CZNC::GetVersion();
+		mcsHeaders["User-Agent"] = "znc-palaver/" + CString(ZNC_PALAVER_VERSION) + " znc/" + CZNC::GetVersion();
 
 		if (sMethod.Equals("GET") == false || sContent.length() > 0) {
 			mcsHeaders["Content-Length"] = CString(sContent.length());
@@ -1280,7 +1280,7 @@ public:
 		PutModule("Be sure to include all information from this command so we can try and debug any issues.");
 		PutModule("--");
 
-		PutModule("Palaver ZNC: " + CString(PALAVER_VERSION) + " -- http://palaverapp.com/");
+		PutModule("Palaver ZNC: " + CString(ZNC_PALAVER_VERSION) + " -- http://palaverapp.com/");
 		CDevice *pDevice = DeviceForClient(*m_pClient);
 		if (pDevice) {
 			PutModule("Current device: (" + pDevice->GetIdentifier() + ")");