- m_hNetlibUser moved to PROTO_INTERFACE;

- unified protocol loggers

git-svn-id: http://svn.miranda-ng.org/main/trunk@6435 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 6 insertions, 6 deletions

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index 1a50b27e70..86bebdf450 100644
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -93,7 +93,7 @@ void CJabberProto::DBAddAuthRequest(const TCHAR *jid, const TCHAR *nick)
 	*pCurBlob = '\0';					//reason

 

 	db_event_add(NULL, &dbei);

-	Log("Setup DBAUTHREQUEST with nick='%s' jid='%s'", szNick, szJid);

+	debugLogA("Setup DBAUTHREQUEST with nick='%s' jid='%s'", szNick, szJid);

 

 	mir_free(szJid);

 	mir_free(szNick);

@@ -138,7 +138,7 @@ HANDLE CJabberProto::DBCreateContact(const TCHAR *jid, const TCHAR *nick, BOOL t
 		db_set_b(hNewContact, "CList", "NotOnList", 1);

 	else

 		SendGetVcard(s);

-	Log("Create Jabber contact jid=%S, nick=%S", s, nick);

+	debugLogA("Create Jabber contact jid=%S, nick=%S", s, nick);

 	DBCheckIsTransportedContact(s,hNewContact);

 	return hNewContact;

 }

@@ -344,7 +344,7 @@ void CJabberProto::UpdateMirVer(JABBER_LIST_ITEM *item)
 	if ( !hContact)

 		return;

 

-	Log("JabberUpdateMirVer: for jid %S", item->jid);

+	debugLogA("JabberUpdateMirVer: for jid %S", item->jid);

 

 	pResourceStatus p(NULL);

 	if (item->resourceMode == RSMODE_LASTSEEN)

@@ -364,7 +364,7 @@ void CJabberProto::FormatMirVer(pResourceStatus &resource, TCHAR *buf, int bufSi
 

 	// jabber:iq:version info requested and exists?

 	if (resource->m_dwVersionRequestTime && resource->m_tszSoftware) {

-		Log("JabberUpdateMirVer: for iq:version rc %S: %S", resource->m_tszResourceName, resource->m_tszSoftware);

+		debugLogA("JabberUpdateMirVer: for iq:version rc %S: %S", resource->m_tszResourceName, resource->m_tszSoftware);

 		if ( !resource->m_tszSoftwareVersion || _tcsstr(resource->m_tszSoftware, resource->m_tszSoftwareVersion))

 			lstrcpyn(buf, resource->m_tszSoftware, bufSize);

 		else

@@ -372,13 +372,13 @@ void CJabberProto::FormatMirVer(pResourceStatus &resource, TCHAR *buf, int bufSi
 	}

 	// no version info and no caps info? set MirVer = resource name

 	else if ( !resource->m_tszCapsNode || !resource->m_tszCapsVer) {

-		Log("JabberUpdateMirVer: for rc %S: %S", resource->m_tszResourceName, resource->m_tszResourceName);

+		debugLogA("JabberUpdateMirVer: for rc %S: %S", resource->m_tszResourceName, resource->m_tszResourceName);

 		if (resource->m_tszResourceName)

 			lstrcpyn(buf, resource->m_tszResourceName, bufSize);

 	}

 	// XEP-0115 caps mode

 	else {

-		Log("JabberUpdateMirVer: for rc %S: %S#%S", resource->m_tszResourceName, resource->m_tszCapsNode, resource->m_tszCapsVer);

+		debugLogA("JabberUpdateMirVer: for rc %S: %S#%S", resource->m_tszResourceName, resource->m_tszCapsNode, resource->m_tszCapsVer);

 

 		int i;