summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2024-07-17 14:32:44 +0300
committerGeorge Hazan <george.hazan@gmail.com>2024-07-17 14:32:44 +0300
commita6ba29ac5ea3e7c6fbb005f2ea88ce1df9e1057b (patch)
tree3b523b4d6a87f2d9cb3dc4cae9aeb9950748b049
parent40e3aefb71b033d8aeb120e33e86fe0f2c757a11 (diff)
fixes #4533 (Jabber: версия Миранды сообщается некорректно)
-rw-r--r--protocols/JabberG/src/jabber_caps.cpp4
-rw-r--r--protocols/JabberG/src/stdafx.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp
index 7c665053b6..65df16081d 100644
--- a/protocols/JabberG/src/jabber_caps.cpp
+++ b/protocols/JabberG/src/jabber_caps.cpp
@@ -294,7 +294,7 @@ bool CJabberProto::HandleCapsInfoRequest(const TiXmlElement *, CJabberIqInfo *pI
CMStringA szName(getMStringA("Identity", "Miranda")); // hidden setting to be entered from dbeditor++
if (m_bAllowVersionRequests)
- szName.AppendFormat(" %s", __VERSION_STRING_DOTS);
+ szName.AppendFormat(" %s", MIRANDA_VERSION_CORE_STRING);
query << XCHILD("identity") << XATTR("category", "client") << XATTR("type", "pc") << XATTR("name", szName);
for (auto &it : GetSortedFeatStrings(GetOwnCaps())) {
@@ -384,7 +384,7 @@ void CJabberProto::UpdateFeatHash()
{
CMStringA szName(getMStringA("Identity", "Miranda")); // hidden setting to be entered from dbeditor++
if (m_bAllowVersionRequests)
- szName.AppendFormat(" %s", __VERSION_STRING_DOTS);
+ szName.AppendFormat(" %s", MIRANDA_VERSION_CORE_STRING);
CMStringA feat_buf(FORMAT, "client/pc//%s<", szName.c_str());
for (auto &it : GetSortedFeatStrings(GetOwnCaps())) {
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index f7d39a2838..e3d575442d 100644
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -86,6 +86,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_toptoolbar.h>
#include <m_userinfo.h>
#include <m_utils.h>
+#include <m_version.h>
#include <m_xstatus.h>
#include <m_imgsrvc.h>
#include <m_clc.h>