Jabber: more portable version of a crutch with full vcard hash

2 files changed, 11 insertions, 7 deletions

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 57e18df43f..b3446760ff 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -1638,7 +1638,8 @@ void CJabberProto::OnProcessPresence(const TiXmlElement *node, ThreadData *info)
 

 			debugLogA("Avatar enabled");

 			for (auto *xNode : TiXmlFilter(node, "x")) {

-				if (!mir_strcmp(XmlGetAttr(xNode, "xmlns"), "vcard-temp:x:update")) {

+				auto *pszNamespace = XmlGetAttr(xNode, "xmlns");

+				if (!mir_strcmp(pszNamespace, "vcard-temp:x:update")) {

 					auto *szPhoto = XmlGetChildText(xNode, "photo");

 					if (szPhoto && !bHasAvatar) {

 						if (mir_strlen(szPhoto)) {

@@ -1653,8 +1654,9 @@ void CJabberProto::OnProcessPresence(const TiXmlElement *node, ThreadData *info)
 						}

 						else bRemovedAvatar = true;

 					}

-

-					const char *txt = XmlGetAttr(xNode, "vcard");

+				}

+				else if (!mir_strcmp(pszNamespace, "miranda:x:vcard")) {

+					auto *txt = xNode->GetText();

 					if (mir_strlen(txt)) {

 						ptrA saved(getStringA(hContact, "VCardHash"));

 						if (saved == nullptr || mir_strcmp(saved, txt)) {

diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 82f27729bb..a0a281f0f9 100755
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -446,15 +446,17 @@ void CJabberProto::SendPresenceTo(int status, const char *to, const TiXmlElement
 	if (m_bEnableAvatars) {

 		TiXmlElement *x = p << XCHILDNS("x", "vcard-temp:x:update");

 

-		ptrA vcardHash(getUStringA("VCardHash"));

-		if (vcardHash != nullptr)

-			x << XATTR("vcard", vcardHash);

-

 		ptrA hashValue(getUStringA("AvatarHash"));

 		if (hashValue != nullptr) // XEP-0153: vCard-Based Avatars

 			x << XCHILD("photo", hashValue);

 		else

 			x << XCHILD("photo");

+

+		ptrA vcardHash(getUStringA("VCardHash"));

+		if (vcardHash != nullptr) {

+			x = p << XCHILDNS("x", "miranda:x:vcard");

+			x->SetText(vcardHash.get());

+		}

 	}

 	{

 		mir_cslock lck(m_csModeMsgMutex);