From 0b551d05899081e6f235cddce0332fce9b6e30a5 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Tue, 20 Aug 2013 20:43:02 +0000 Subject: Tlen: Try to fix login issues (fixes 447) git-svn-id: http://svn.miranda-ng.org/main/trunk@5765 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tlen/src/tlen_svc.cpp | 4 ++-- protocols/Tlen/src/tlen_thread.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp index 692c09b9ec..c8298b9b88 100644 --- a/protocols/Tlen/src/tlen_svc.cpp +++ b/protocols/Tlen/src/tlen_svc.cpp @@ -643,14 +643,14 @@ int TlenProtocol::SendMsg(HANDLE hContact, int flags, const char* msgRAW) else if (!strcmp(msgType, "privchat")) TlenSend(this, "%s", dbv.pszVal, msgEnc); else - TlenSend(this, "%s", dbv.pszVal, msgType, id, msgEnc); + TlenSend(this, "%s", dbv.pszVal, msgType, id, msgEnc); TlenForkThread(TlenSendMessageAckThread, 0, new SENDACKTHREADDATA(this, hContact, id)); } else { if ((item=TlenListGetItemPtr(this, LIST_ROSTER, dbv.pszVal)) != NULL) item->idMsgAckPending = id; - TlenSend(this, "%s", dbv.pszVal, msgType, id, msgEnc); + TlenSend(this, "%s", dbv.pszVal, msgType, id, msgEnc); } } mir_free(msgEnc); diff --git a/protocols/Tlen/src/tlen_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp index 4c6fa4ecec..5f143389ae 100644 --- a/protocols/Tlen/src/tlen_thread.cpp +++ b/protocols/Tlen/src/tlen_thread.cpp @@ -638,17 +638,17 @@ static void TlenProcessMessage(XmlNode *node, ThreadData *info) i = 1; while ((xNode=TlenXmlGetNthChild(node, "x", i)) != NULL) { if ((p=TlenXmlGetAttrValue(xNode, "xmlns")) != NULL) { - if (!strcmp(p, "tlen:x:delay") && msgTime==0) { + if (!strcmp(p, "jabber:x:delay") && msgTime==0) { if ((p=TlenXmlGetAttrValue(xNode, "stamp")) != NULL) { msgTime = TlenIsoToUnixTime(p); } } - else if (!strcmp(p, "tlen:x:event")) { + else if (!strcmp(p, "jabber:x:event")) { // Check whether any event is requested if (!delivered && (n=TlenXmlGetChild(xNode, "delivered")) != NULL) { delivered = TRUE; idStr = TlenXmlGetAttrValue(node, "id"); - TlenSend(info->proto, "%s", from, (idStr != NULL)?idStr:""); + TlenSend(info->proto, "%s", from, (idStr != NULL)?idStr:""); } if (item != NULL && TlenXmlGetChild(xNode, "composing") != NULL) { composing = TRUE; -- cgit v1.2.3