From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 20:47:51 +0000
Subject: HCONTACT is not needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_thread.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'protocols/JabberG/src/jabber_thread.cpp')

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index eed8b47784..41c7238f64 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -559,7 +559,7 @@ recvRest:
 			ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)oldStatus, m_iStatus);
 
 			// Set all contacts to offline
-			for (HCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName))
+			for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName))
 				SetContactOfflineStatus(hContact);
 
 			mir_free(m_szJabberJID);
@@ -995,7 +995,7 @@ void CJabberProto::OnProcessPubsubEvent(HXML node)
 
 	m_pepServices.ProcessEvent(from, eventNode);
 
-	HCONTACT hContact = HContactFromJID(from);
+	MCONTACT hContact = HContactFromJID(from);
 	if (!hContact)
 		return;
 
@@ -1030,7 +1030,7 @@ void CJabberProto::OnProcessPubsubEvent(HXML node)
 }
 
 // returns 0, if error or no events
-DWORD JabberGetLastContactMessageTime(HCONTACT hContact)
+DWORD JabberGetLastContactMessageTime(MCONTACT hContact)
 {
 	// TODO: time cache can improve performance
 	HANDLE hDbEvent = db_event_last(hContact);
@@ -1051,9 +1051,9 @@ DWORD JabberGetLastContactMessageTime(HCONTACT hContact)
 	return dwTime;
 }
 
-HCONTACT CJabberProto::CreateTemporaryContact(const TCHAR *szJid, JABBER_LIST_ITEM* chatItem)
+MCONTACT CJabberProto::CreateTemporaryContact(const TCHAR *szJid, JABBER_LIST_ITEM* chatItem)
 {
-	HCONTACT hContact = NULL;
+	MCONTACT hContact = NULL;
 	if (chatItem) {
 		const TCHAR *p = _tcschr(szJid, '/');
 		if (p != NULL && p[1] != '\0')
@@ -1101,7 +1101,7 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData* info)
 	if (m_messageManager.HandleMessagePermanent(node, info))
 		return;
 
-	HCONTACT hContact = HContactFromJID(from);
+	MCONTACT hContact = HContactFromJID(from);
 	JABBER_LIST_ITEM *chatItem = ListGetItemPtr(LIST_CHATROOM, from);
 	if (chatItem) {
 		HXML xCaptcha = xmlGetChild(node, "captcha");
@@ -1353,12 +1353,12 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData* info)
 				const TCHAR *group = xmlGetText(xmlGetChild(iNode, _T("group")));
 				if (action && jid && _tcsstr(jid, chkJID)) {
 					if (!_tcscmp(action, _T("add"))) {
-						HCONTACT hContact = DBCreateContact(jid, nick, FALSE, FALSE);
+						MCONTACT hContact = DBCreateContact(jid, nick, FALSE, FALSE);
 						if (group)
 							db_set_ts(hContact, "CList", "Group", group);
 					}
 					else if (!_tcscmp(action, _T("delete"))) {
-						HCONTACT hContact = HContactFromJID(jid);
+						MCONTACT hContact = HContactFromJID(jid);
 						if (hContact)
 							CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);
 					}
@@ -1462,7 +1462,7 @@ void CJabberProto::OnProcessPresenceCapabilites(HXML node)
 			r->m_tszCapsNode = mir_tstrdup(szNode);
 			r->m_tszCapsVer = mir_tstrdup(szVer);
 			r->m_tszCapsExt = mir_tstrdup(szExt);
-			HCONTACT hContact = HContactFromJID(from);
+			MCONTACT hContact = HContactFromJID(from);
 			if (hContact)
 				UpdateMirVer(hContact, r);
 		}
@@ -1477,7 +1477,7 @@ void CJabberProto::UpdateJidDbSettings(const TCHAR *jid)
 	JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_ROSTER, jid);
 	if (item == NULL)
 		return;
-	HCONTACT hContact = HContactFromJID(jid);
+	MCONTACT hContact = HContactFromJID(jid);
 	if (hContact == NULL)
 		return;
 
@@ -1535,7 +1535,7 @@ void CJabberProto::UpdateJidDbSettings(const TCHAR *jid)
 
 void CJabberProto::OnProcessPresence(HXML node, ThreadData* info)
 {
-	HCONTACT hContact;
+	MCONTACT hContact;
 	HXML showNode;
 	JABBER_LIST_ITEM *item;
 	LPCTSTR from, show;
-- 
cgit v1.2.3