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_archive.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/protocols/JabberG/src/jabber_archive.cpp b/protocols/JabberG/src/jabber_archive.cpp
index 11c972ca3b..ae4e61ad05 100644
--- a/protocols/JabberG/src/jabber_archive.cpp
+++ b/protocols/JabberG/src/jabber_archive.cpp
@@ -32,7 +32,7 @@ void CJabberProto::EnableArchive(bool bEnable)
 		<< XCHILDNS( _T("auto"), JABBER_FEAT_ARCHIVE) << XATTR(_T("save"), (bEnable) ? _T("true") : _T("false")));
 }
 
-void CJabberProto::RetrieveMessageArchive(HCONTACT hContact, JABBER_LIST_ITEM *pItem)
+void CJabberProto::RetrieveMessageArchive(MCONTACT hContact, JABBER_LIST_ITEM *pItem)
 {
 	if (pItem->bHistoryRead)
 		return;
@@ -60,7 +60,7 @@ void CJabberProto::OnIqResultGetCollectionList(HXML iqNode, CJabberIqInfo*)
 	if (!list || lstrcmp( xmlGetAttrValue(list, _T("xmlns")), JABBER_FEAT_ARCHIVE))
 		return;
 
-	HCONTACT hContact = NULL;
+	MCONTACT hContact = NULL;
 	time_t tmLast = 0;
 
 	for (int nodeIdx = 1; ; nodeIdx++) {
@@ -95,11 +95,11 @@ void CJabberProto::OnIqResultGetCollectionList(HXML iqNode, CJabberIqInfo*)
 /////////////////////////////////////////////////////////////////////////////////////////
 
 static DWORD dwPreviousTimeStamp = -1;
-static HCONTACT hPreviousContact = (HCONTACT)INVALID_HANDLE_VALUE;
+static MCONTACT hPreviousContact = INVALID_CONTACT_ID;
 static HANDLE hPreviousDbEvent = NULL;
 
 // Returns TRUE if the event already exist in the database
-BOOL IsDuplicateEvent(HCONTACT hContact, DBEVENTINFO& dbei)
+BOOL IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO& dbei)
 {
 	HANDLE hExistingDbEvent;
 	DWORD dwEventTimeStamp;
@@ -240,7 +240,7 @@ BOOL IsDuplicateEvent(HCONTACT hContact, DBEVENTINFO& dbei)
 		}
 	}
 	// reset last event
-	hPreviousContact = (HCONTACT)INVALID_HANDLE_VALUE;
+	hPreviousContact = INVALID_CONTACT_ID;
 	return FALSE;
 }
 
@@ -258,7 +258,7 @@ void CJabberProto::OnIqResultGetCollection(HXML iqNode, CJabberIqInfo*)
 	if (!start || !with)
 		return;
 
-	HCONTACT hContact = HContactFromJID(with);
+	MCONTACT hContact = HContactFromJID(with);
 	time_t tmStart = str2time(start);
 	if (hContact == 0 || tmStart == 0)
 		return;
-- 
cgit v1.2.3