From 2334ddc39a0c0f847239c8b331ec1c9a2a12754b Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Tue, 20 Aug 2013 20:36:14 +0000
Subject: Tlen: Try to fix login issues (fixes 447)

git-svn-id: http://svn.miranda-ng.org/main/trunk@5764 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Tlen/src/tlen_svc.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'protocols/Tlen/src/tlen_svc.cpp')

diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 6b9de79f63..692c09b9ec 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -63,9 +63,9 @@ int TlenRunSearch(TlenProtocol *proto) {
 		iqId = proto->searchID;
 		TlenIqAdd(proto, iqId, IQ_PROC_GETSEARCH, TlenIqResultSearch);
 		if (proto->searchIndex == 0) {
-			TlenSend(proto, "<iq type='get' id='"TLEN_IQID"%d' to='tuba'><query xmlns='tlen:iq:search'>%s</query></iq>", iqId, proto->searchQuery);
+			TlenSend(proto, "<iq type='get' id='"TLEN_IQID"%d' to='tuba'><query xmlns='jabber:iq:search'>%s</query></iq>", iqId, proto->searchQuery);
 		} else {
-			TlenSend(proto, "<iq type='get' id='"TLEN_IQID"%d' to='tuba'><query xmlns='tlen:iq:search'>%s<f>%d</f></query></iq>", iqId, proto->searchQuery, proto->searchIndex * TLEN_MAX_SEARCH_RESULTS_PER_PAGE);
+			TlenSend(proto, "<iq type='get' id='"TLEN_IQID"%d' to='tuba'><query xmlns='jabber:iq:search'>%s<f>%d</f></query></iq>", iqId, proto->searchQuery, proto->searchIndex * TLEN_MAX_SEARCH_RESULTS_PER_PAGE);
 		}
 		proto->searchIndex ++;
 	}
@@ -340,7 +340,7 @@ int TlenProtocol::AuthDeny(HANDLE hDbEvent, const PROTOCHAR* szReason)
 	char *jid = lastName + strlen(lastName) + 1;
 
 	TlenSend(this, "<presence to='%s' type='unsubscribed'/>", jid);
-	TlenSend(this, "<iq type='set'><query xmlns='tlen:iq:roster'><item jid='%s' subscription='remove'/></query></iq>", jid);
+	TlenSend(this, "<iq type='set'><query xmlns='jabber:iq:roster'><item jid='%s' subscription='remove'/></query></iq>", jid);
 	mir_free(dbei.pBlob);
 	return 0;
 }
@@ -483,14 +483,14 @@ int TlenProtocol::GetInfo(HANDLE hContact, int infoType)
 	if (hContact == NULL) {
 		iqId = TlenSerialNext(this);
 		TlenIqAdd(this, iqId, IQ_PROC_NONE, TlenIqResultVcard);
-		TlenSend(this, "<iq type='get' id='"TLEN_IQID"%d' to='tuba'><query xmlns='tlen:iq:register'></query></iq>", iqId);
+		TlenSend(this, "<iq type='get' id='"TLEN_IQID"%d' to='tuba'><query xmlns='jabber:iq:register'></query></iq>", iqId);
 	} else {
 		if (db_get(hContact, m_szModuleName, "jid", &dbv)) return 1;
 		if ((nick=TlenNickFromJID(dbv.pszVal)) != NULL) {
 			if ((pNick=TlenTextEncode(nick)) != NULL) {
 				iqId = TlenSerialNext(this);
 				TlenIqAdd(this, iqId, IQ_PROC_NONE, TlenIqResultVcard);
-				TlenSend(this, "<iq type='get' id='"TLEN_IQID"%d' to='tuba'><query xmlns='tlen:iq:search'><i>%s</i></query></iq>", iqId, pNick);
+				TlenSend(this, "<iq type='get' id='"TLEN_IQID"%d' to='tuba'><query xmlns='jabber:iq:search'><i>%s</i></query></iq>", iqId, pNick);
 				mir_free(pNick);
 			}
 			mir_free(nick);
@@ -921,14 +921,14 @@ int TlenProtocol::TlenDbSettingChanged(WPARAM wParam, LPARAM lParam)
 						// Note: we need to compare with item->group to prevent infinite loop
 						if (cws->value.type == DBVT_DELETED && item->group != NULL) {
 							TlenLog(this, "Group set to nothing");
-							TlenSend(this, "<iq type='set'><query xmlns='tlen:iq:roster'><item name='%s' jid='%s'></item></query></iq>", nick, item->jid);
+							TlenSend(this, "<iq type='set'><query xmlns='jabber:iq:roster'><item name='%s' jid='%s'></item></query></iq>", nick, item->jid);
 						}
 						else if (cws->value.pszVal != NULL) {
 							char *newGroup = settingToChar(cws);
 							if (item->group == NULL || strcmp(newGroup, item->group)) {
 								TlenLog(this, "Group set to %s", newGroup);
 								if ((group=TlenGroupEncode(newGroup)) != NULL) {
-									TlenSend(this, "<iq type='set'><query xmlns='tlen:iq:roster'><item name='%s' jid='%s'><group>%s</group></item></query></iq>", nick, item->jid, group);
+									TlenSend(this, "<iq type='set'><query xmlns='jabber:iq:roster'><item name='%s' jid='%s'><group>%s</group></item></query></iq>", nick, item->jid, group);
 									mir_free(group);
 								}
 							}
@@ -965,10 +965,10 @@ int TlenProtocol::TlenDbSettingChanged(WPARAM wParam, LPARAM lParam)
 						if ((nick=TlenTextEncode(newNick)) != NULL) {
 							TlenLog(this, "Nick set to %s", newNick);
 							if (item->group != NULL && (group=TlenGroupEncode(item->group)) != NULL) {
-								TlenSend(this, "<iq type='set'><query xmlns='tlen:iq:roster'><item name='%s' jid='%s'><group>%s</group></item></query></iq>", nick, jid, group);
+								TlenSend(this, "<iq type='set'><query xmlns='jabber:iq:roster'><item name='%s' jid='%s'><group>%s</group></item></query></iq>", nick, jid, group);
 								mir_free(group);
 							} else {
-								TlenSend(this, "<iq type='set'><query xmlns='tlen:iq:roster'><item name='%s' jid='%s'></item></query></iq>", nick, jid);
+								TlenSend(this, "<iq type='set'><query xmlns='jabber:iq:roster'><item name='%s' jid='%s'></item></query></iq>", nick, jid);
 							}
 							mir_free(nick);
 						}
@@ -998,14 +998,14 @@ int TlenProtocol::TlenDbSettingChanged(WPARAM wParam, LPARAM lParam)
 						TlenLog(this, "jid=%s nick=%s", jid, nick);
 						if (!db_get(hContact, "CList", "Group", &dbv)) {
 							if ((pGroup=TlenGroupEncode(dbv.pszVal)) != NULL) {
-								TlenSend(this, "<iq type='set'><query xmlns='tlen:iq:roster'><item name='%s' jid='%s'><group>%s</group></item></query></iq>", nick, jid, pGroup);
+								TlenSend(this, "<iq type='set'><query xmlns='jabber:iq:roster'><item name='%s' jid='%s'><group>%s</group></item></query></iq>", nick, jid, pGroup);
 								TlenSend(this, "<presence to='%s' type='subscribe'/>", jid);
 								mir_free(pGroup);
 							}
 							db_free(&dbv);
 						}
 						else {
-							TlenSend(this, "<iq type='set'><query xmlns='tlen:iq:roster'><item name='%s' jid='%s'/></query></iq>", nick, jid);
+							TlenSend(this, "<iq type='set'><query xmlns='jabber:iq:roster'><item name='%s' jid='%s'/></query></iq>", nick, jid);
 							TlenSend(this, "<presence to='%s' type='subscribe'/>", jid);
 						}
 						mir_free(nick);
@@ -1041,7 +1041,7 @@ int TlenProtocol::TlenContactDeleted(WPARAM wParam, LPARAM lParam)
 
 		// Remove from roster, server also handles the presence unsubscription process.
 		if (TlenListExist(this, LIST_ROSTER, jid))
-			TlenSend(this, "<iq type='set'><query xmlns='tlen:iq:roster'><item jid='%s' subscription='remove'/></query></iq>", jid);
+			TlenSend(this, "<iq type='set'><query xmlns='jabber:iq:roster'><item jid='%s' subscription='remove'/></query></iq>", jid);
 
 		db_free(&dbv);
 	}
-- 
cgit v1.2.3