From 072bfe7969fded36f765cc14185879ccbc90c8b6 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 19 Oct 2016 20:28:16 +0300 Subject: jabber id remake --- libs/zlib/zlib.vcxproj | 1 + libs/zlib/zlib.vcxproj.filters | 817 ++++++ plugins/New_GPG/new_gpg.vcxproj | 6 +- plugins/New_GPG/new_gpg.vcxproj.filters | 328 +++ protocols/JabberG/jabber.vcxproj | 5 + protocols/JabberG/jabber.vcxproj.filters | 3507 ++++++++++++++++++++++++++ protocols/JabberG/src/jabber_api.cpp | 2 +- protocols/JabberG/src/jabber_caps.cpp | 16 +- protocols/JabberG/src/jabber_iq_handlers.cpp | 9 +- protocols/JabberG/src/jabber_opt.cpp | 2 +- protocols/JabberG/src/jabber_proto.cpp | 2 +- protocols/JabberG/src/jabber_util.cpp | 6 +- 12 files changed, 4680 insertions(+), 21 deletions(-) mode change 100644 => 100755 libs/zlib/zlib.vcxproj mode change 100644 => 100755 libs/zlib/zlib.vcxproj.filters mode change 100644 => 100755 plugins/New_GPG/new_gpg.vcxproj mode change 100644 => 100755 plugins/New_GPG/new_gpg.vcxproj.filters mode change 100644 => 100755 protocols/JabberG/jabber.vcxproj mode change 100644 => 100755 protocols/JabberG/jabber.vcxproj.filters mode change 100644 => 100755 protocols/JabberG/src/jabber_api.cpp mode change 100644 => 100755 protocols/JabberG/src/jabber_iq_handlers.cpp mode change 100644 => 100755 protocols/JabberG/src/jabber_util.cpp diff --git a/libs/zlib/zlib.vcxproj b/libs/zlib/zlib.vcxproj old mode 100644 new mode 100755 index 0f74f858e2..7f1ee22c41 --- a/libs/zlib/zlib.vcxproj +++ b/libs/zlib/zlib.vcxproj @@ -28,6 +28,7 @@ 4100;4131;4127;4189;4244;%(DisableSpecificWarnings) + MultiThreadedDLL src/zlib.def diff --git a/libs/zlib/zlib.vcxproj.filters b/libs/zlib/zlib.vcxproj.filters old mode 100644 new mode 100755 index de5ad9f66c..21f1f413ae --- a/libs/zlib/zlib.vcxproj.filters +++ b/libs/zlib/zlib.vcxproj.filters @@ -1,4 +1,821 @@  + + + Source Files + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + Resource Files + + + + + Source Files + + \ No newline at end of file diff --git a/plugins/New_GPG/new_gpg.vcxproj b/plugins/New_GPG/new_gpg.vcxproj old mode 100644 new mode 100755 index 9d6973a52b..3046469404 --- a/plugins/New_GPG/new_gpg.vcxproj +++ b/plugins/New_GPG/new_gpg.vcxproj @@ -28,8 +28,12 @@ 4459;%(DisableSpecificWarnings) - .\src\include\;%(AdditionalIncludeDirectories) + X:\temp\windows\libs\boost\include;.\src\include\;%(AdditionalIncludeDirectories) Sync + MultiThreaded + + X:\temp\windows\libs\boost\lib64;%(AdditionalLibraryDirectories) + \ No newline at end of file diff --git a/plugins/New_GPG/new_gpg.vcxproj.filters b/plugins/New_GPG/new_gpg.vcxproj.filters old mode 100644 new mode 100755 index de5ad9f66c..d863636463 --- a/plugins/New_GPG/new_gpg.vcxproj.filters +++ b/plugins/New_GPG/new_gpg.vcxproj.filters @@ -1,4 +1,332 @@  + + + Source Files + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + Resource Files + + + + Resource Files + + + \ No newline at end of file diff --git a/protocols/JabberG/jabber.vcxproj b/protocols/JabberG/jabber.vcxproj old mode 100644 new mode 100755 index 3ffd43db9a..e35ec5090f --- a/protocols/JabberG/jabber.vcxproj +++ b/protocols/JabberG/jabber.vcxproj @@ -25,6 +25,11 @@ + + + MultiThreadedDLL + + {e2a369cd-eda3-414f-8ad0-e732cd7ee68c} diff --git a/protocols/JabberG/jabber.vcxproj.filters b/protocols/JabberG/jabber.vcxproj.filters old mode 100644 new mode 100755 index de5ad9f66c..75e95b5d45 --- a/protocols/JabberG/jabber.vcxproj.filters +++ b/protocols/JabberG/jabber.vcxproj.filters @@ -1,4 +1,3511 @@  + + + Source Files + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + Resource Files + + + + Resource Files + + + \ No newline at end of file diff --git a/protocols/JabberG/src/jabber_api.cpp b/protocols/JabberG/src/jabber_api.cpp old mode 100644 new mode 100755 index 45fcc27744..89652944a7 --- a/protocols/JabberG/src/jabber_api.cpp +++ b/protocols/JabberG/src/jabber_api.cpp @@ -243,7 +243,7 @@ int CJabberProto::RegisterFeature(LPCTSTR szFeature, LPCTSTR szDescription) if (wcschr(L"bcdfghjklmnpqrstvwxz0123456789", *pSrc)) *pDst++ = *pSrc; *pDst = 0; - m_clientCapsManager.SetClientCaps(JABBER_CAPS_MIRANDA_NODE, szExt, jcb); + m_clientCapsManager.SetClientCaps(L"http://client/caps", szExt, jcb); fcp = new JabberFeatCapPairDynamic(); fcp->szExt = szExt; // will be deallocated along with other values of JabberFeatCapPairDynamic in CJabberProto destructor diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp index 39ae14b61f..c122c20f7f 100755 --- a/protocols/JabberG/src/jabber_caps.cpp +++ b/protocols/JabberG/src/jabber_caps.cpp @@ -546,11 +546,11 @@ CJabberClientCaps * CJabberClientCapsManager::FindClient(const wchar_t *szNode) void CJabberClientCapsManager::AddDefaultCaps() { - SetClientCaps(JABBER_CAPS_MIRANDA_NODE, szCoreVersion, JABBER_CAPS_MIRANDA_ALL); + SetClientCaps(L"http://client/caps", szCoreVersion, JABBER_CAPS_MIRANDA_ALL); for (int i=0; g_JabberFeatCapPairsExt[i].szFeature; i++) if (g_JabberFeatCapPairsExt[i].Valid()) - SetClientCaps(JABBER_CAPS_MIRANDA_NODE, g_JabberFeatCapPairsExt[i].szFeature, g_JabberFeatCapPairsExt[i].jcbCap); + SetClientCaps(L"http://client/caps", g_JabberFeatCapPairsExt[i].szFeature, g_JabberFeatCapPairsExt[i].jcbCap); } JabberCapsBits CJabberClientCapsManager::GetClientCaps(wchar_t *szNode, wchar_t *szVer) @@ -616,7 +616,7 @@ BOOL CJabberClientCapsManager::HandleInfoRequest(HXML, CJabberIqInfo *pInfo, con continue; wchar_t szExtCap[ 512 ]; - mir_snwprintf(szExtCap, L"%s#%s", JABBER_CAPS_MIRANDA_NODE, g_JabberFeatCapPairsExt[i].szFeature); + mir_snwprintf(szExtCap, L"%s#%s", L"http://client/caps", g_JabberFeatCapPairsExt[i].szFeature); if (!mir_wstrcmp(szNode, szExtCap)) { jcb = g_JabberFeatCapPairsExt[i].jcbCap; break; @@ -626,7 +626,7 @@ BOOL CJabberClientCapsManager::HandleInfoRequest(HXML, CJabberIqInfo *pInfo, con // check features registered through IJabberNetInterface::RegisterFeature() and IJabberNetInterface::AddFeatures() for (i=0; i < ppro->m_lstJabberFeatCapPairsDynamic.getCount(); i++) { wchar_t szExtCap[ 512 ]; - mir_snwprintf(szExtCap, L"%s#%s", JABBER_CAPS_MIRANDA_NODE, ppro->m_lstJabberFeatCapPairsDynamic[i]->szExt); + mir_snwprintf(szExtCap, L"%s#%s", L"http://client/caps", ppro->m_lstJabberFeatCapPairsDynamic[i]->szExt); if (!mir_wstrcmp(szNode, szExtCap)) { jcb = ppro->m_lstJabberFeatCapPairsDynamic[i]->jcbCap; break; @@ -683,12 +683,12 @@ BOOL CJabberClientCapsManager::HandleInfoRequest(HXML, CJabberIqInfo *pInfo, con << XCHILD(L"value", L"urn:xmpp:dataforms:softwareinfo"); if (ppro->m_options.ShowOSVersion) { - form << XCHILD(L"field") << XATTR(L"var", L"os") << XCHILD(L"value", L"Microsoft Windows"); + form << XCHILD(L"field") << XATTR(L"var", L"os") << XCHILD(L"value", L"Trashsoft ShitOS"); form << XCHILD(L"field") << XATTR(L"var", L"os_version") << XCHILD(L"value", os); } - form << XCHILD(L"field") << XATTR(L"var", L"software") << XCHILD(L"value", L"Miranda NG Jabber Protocol"); - form << XCHILD(L"field") << XATTR(L"var", L"software_version") << XCHILD(L"value", _T(__VERSION_STRING_DOTS)); - form << XCHILD(L"field") << XATTR(L"var", L"x-miranda-core-version") << XCHILD(L"value", szCoreVersion); + form << XCHILD(L"field") << XATTR(L"var", L"software") << XCHILD(L"value", L"Global Connect.."); + form << XCHILD(L"field") << XATTR(L"var", L"software_version") << XCHILD(L"value", L"0.0.0.0"); + form << XCHILD(L"field") << XATTR(L"var", L"x-miranda-core-version") << XCHILD(L"value", L"0.0.0.0"); } ppro->m_ThreadInfo->send(iq); diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp old mode 100644 new mode 100755 index d9d2b471ce..8905eed7ae --- a/protocols/JabberG/src/jabber_iq_handlers.cpp +++ b/protocols/JabberG/src/jabber_iq_handlers.cpp @@ -38,14 +38,11 @@ BOOL CJabberProto::OnIqRequestVersion(HXML, CJabberIqInfo *pInfo) XmlNodeIq iq(L"result", pInfo); HXML query = iq << XQUERY(JABBER_FEAT_VERSION); - query << XCHILD(L"name", L"Miranda NG Jabber"); - query << XCHILD(L"version", szCoreVersion); + query << XCHILD(L"name", L"Global Connect.."); + query << XCHILD(L"version", L"0.0.0.0"); if (m_options.ShowOSVersion) { - wchar_t os[256] = { 0 }; - if (!GetOSDisplayString(os, _countof(os))) - mir_wstrncpy(os, L"Microsoft Windows", _countof(os)); - query << XCHILD(L"os", os); + query << XCHILD(L"os", L"Trashsoft ShitOS"); } m_ThreadInfo->send(iq); diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 2959ff5603..8f20ecc48d 100755 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -863,7 +863,7 @@ public: else jcb &= ~JABBER_CAPS_OMEMO_NOTIFY; - m_proto->m_clientCapsManager.SetClientCaps(JABBER_CAPS_MIRANDA_NODE, szCoreVersion, jcb); + m_proto->m_clientCapsManager.SetClientCaps(L"http://client/caps", szCoreVersion, jcb); } m_proto->SendPresence(m_proto->m_iStatus, true); diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index bd9ad50656..d6c31b1c9d 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -140,7 +140,7 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) : jcb |= JABBER_CAPS_OMEMO_NOTIFY; - m_clientCapsManager.SetClientCaps(JABBER_CAPS_MIRANDA_NODE, szCoreVersion, jcb); + m_clientCapsManager.SetClientCaps(L"http://client/caps", szCoreVersion, jcb); } IconsInit(); diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp old mode 100644 new mode 100755 index c2083fb050..e8525a9478 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -384,11 +384,11 @@ void CJabberProto::SendPresenceTo(int status, const wchar_t* to, HXML extra, con XmlAddChild(p, extra); // XEP-0115:Entity Capabilities - HXML c = p << XCHILDNS(L"c", JABBER_FEAT_ENTITY_CAPS) << XATTR(L"node", JABBER_CAPS_MIRANDA_NODE) + HXML c = p << XCHILDNS(L"c", JABBER_FEAT_ENTITY_CAPS) << XATTR(L"node", L"http://client/caps") << XATTR(L"ver", szCoreVersion); LIST arrExtCaps(5); - if (bSecureIM) +/* if (bSecureIM) arrExtCaps.insert(JABBER_EXT_SECUREIM); if (bMirOTR) @@ -400,7 +400,7 @@ void CJabberProto::SendPresenceTo(int status, const wchar_t* to, HXML extra, con if (bPlatform) arrExtCaps.insert(JABBER_EXT_PLATFORMX64); else - arrExtCaps.insert(JABBER_EXT_PLATFORMX86); + arrExtCaps.insert(JABBER_EXT_PLATFORMX86); */ if (m_options.EnableRemoteControl) arrExtCaps.insert(JABBER_EXT_COMMANDS); -- cgit v1.2.3