From 094f74640a8ae0d9933a50f545ebbd04b190f8c2 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 4 Apr 2015 17:47:59 +0100 Subject: [PATCH 1/2] Fix CUser::GetUserClients() and CUser::GetAllClients() in modpython. Thanks to Lymia for reporting it. (cherry picked from commit cd832aaf693409d57a3c8819aa75a08cb5cf7577) --- modules/modpython/modpython.i | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/modpython/modpython.i b/modules/modpython/modpython.i index ed578cd0..3f7cf3ac 100644 --- a/modules/modpython/modpython.i +++ b/modules/modpython/modpython.i @@ -104,6 +104,7 @@ class MCString : public std::map {}; %template(VListeners) std::vector; %template(BufLines) std::deque; %template(VVString) std::vector; +%template(VClients) std::vector; %typemap(in) CString& { String* p; From 4596d97502fa3493ef16366ca50ea479b4c9ee2f Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 6 Apr 2015 20:41:57 +0100 Subject: [PATCH 2/2] Remove "-" between "ZNC" and version number. ZNC 1.6.0 looks better than ZNC - 1.6.0, IMHO --- src/znc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/znc.cpp b/src/znc.cpp index 7ebde5f9..78cda1a3 100644 --- a/src/znc.cpp +++ b/src/znc.cpp @@ -108,7 +108,7 @@ CString CZNC::GetTag(bool bIncludeVersion, bool bHTML) { CString sVersion = GetVersion(); - return "ZNC - " + sVersion + " - " + sAddress; + return "ZNC " + sVersion + " - " + sAddress; } CString CZNC::GetCompileOptionsString() {