more HCONTACT

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

2 files changed, 34 insertions, 34 deletions

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 2af1d877fe..fad43be645 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -358,7 +358,7 @@ HCONTACT CJabberProto::AddToListByJID(const TCHAR *newJid, DWORD flags)
 	return hContact;

 }

 

-HANDLE CJabberProto::AddToList(int flags, PROTOSEARCHRESULT* psr)

+HCONTACT CJabberProto::AddToList(int flags, PROTOSEARCHRESULT* psr)

 {

 	if (psr->cbSize != sizeof(JABBER_SEARCH_RESULT) && psr->id == NULL)

 		return NULL;

@@ -368,7 +368,7 @@ HANDLE CJabberProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 	return AddToListByJID(jid, flags);

 }

 

-HANDLE __cdecl CJabberProto::AddToListByEvent(int flags, int /*iContact*/, HANDLE hDbEvent)

+HCONTACT __cdecl CJabberProto::AddToListByEvent(int flags, int /*iContact*/, HANDLE hDbEvent)

 {

 	debugLogA("AddToListByEvent");

 

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index 6c90985d43..80b206ce71 100644
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -82,50 +82,50 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	// PROTO_INTERFACE

 	//====================================================================================

 

-	virtual	HANDLE __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

-	virtual	HANDLE __cdecl AddToListByEvent(int flags, int iContact, HANDLE hDbEvent);

+	virtual	HCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

+	virtual	HCONTACT  __cdecl AddToListByEvent(int flags, int iContact, HANDLE hDbEvent);

 

-	virtual	int    __cdecl Authorize(HANDLE hDbEvent);

-	virtual	int    __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR *szReason);

-	virtual	int    __cdecl AuthRecv(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int    __cdecl AuthRequest(HCONTACT hContact, const TCHAR *szMessage);

+	virtual	int       __cdecl Authorize(HANDLE hDbEvent);

+	virtual	int       __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR *szReason);

+	virtual	int       __cdecl AuthRecv(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl AuthRequest(HCONTACT hContact, const TCHAR *szMessage);

 

-	virtual	HANDLE __cdecl ChangeInfo(int iInfoType, void* pInfoData);

+	virtual	HANDLE    __cdecl ChangeInfo(int iInfoType, void* pInfoData);

 

-	virtual	HANDLE __cdecl FileAllow(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

-	virtual	int    __cdecl FileCancel(HCONTACT hContact, HANDLE hTransfer);

-	virtual	int    __cdecl FileDeny(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

-	virtual	int    __cdecl FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename);

+	virtual	HANDLE    __cdecl FileAllow(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

+	virtual	int       __cdecl FileCancel(HCONTACT hContact, HANDLE hTransfer);

+	virtual	int       __cdecl FileDeny(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

+	virtual	int       __cdecl FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename);

 

 	virtual	DWORD_PTR __cdecl GetCaps(int type, HCONTACT hContact = NULL);

-	virtual	int    __cdecl GetInfo(HCONTACT hContact, int infoType);

+	virtual	int       __cdecl GetInfo(HCONTACT hContact, int infoType);

 

-	virtual	HANDLE __cdecl SearchBasic(const TCHAR *id);

-	virtual	HANDLE __cdecl SearchByEmail(const TCHAR *email);

-	virtual	HANDLE __cdecl SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName);

-	virtual	HWND   __cdecl SearchAdvanced(HWND owner);

-	virtual	HWND   __cdecl CreateExtendedSearchUI(HWND owner);

+	virtual	HANDLE    __cdecl SearchBasic(const TCHAR *id);

+	virtual	HANDLE    __cdecl SearchByEmail(const TCHAR *email);

+	virtual	HANDLE    __cdecl SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName);

+	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

+	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int    __cdecl RecvContacts(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int    __cdecl RecvFile(HCONTACT hContact, PROTORECVFILET*);

-	virtual	int    __cdecl RecvMsg(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int    __cdecl RecvUrl(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvContacts(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvFile(HCONTACT hContact, PROTORECVFILET*);

+	virtual	int       __cdecl RecvMsg(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvUrl(HCONTACT hContact, PROTORECVEVENT*);

 

-	virtual	int    __cdecl SendContacts(HCONTACT hContact, int flags, int nContacts, HCONTACT *hContactsList);

-	virtual	HANDLE __cdecl SendFile(HCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

-	virtual	int    __cdecl SendMsg(HCONTACT hContact, int flags, const char *msg);

-	virtual	int    __cdecl SendUrl(HCONTACT hContact, int flags, const char *url);

+	virtual	int       __cdecl SendContacts(HCONTACT hContact, int flags, int nContacts, HCONTACT *hContactsList);

+	virtual	HANDLE    __cdecl SendFile(HCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

+	virtual	int       __cdecl SendMsg(HCONTACT hContact, int flags, const char *msg);

+	virtual	int       __cdecl SendUrl(HCONTACT hContact, int flags, const char *url);

 

-	virtual	int    __cdecl SetApparentMode(HCONTACT hContact, int mode);

-	virtual	int    __cdecl SetStatus(int iNewStatus);

+	virtual	int       __cdecl SetApparentMode(HCONTACT hContact, int mode);

+	virtual	int       __cdecl SetStatus(int iNewStatus);

 

-	virtual	HANDLE __cdecl GetAwayMsg(HCONTACT hContact);

-	virtual	int    __cdecl RecvAwayMsg(HCONTACT hContact, int mode, PROTORECVEVENT* evt);

-	virtual	int    __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);

+	virtual	HANDLE    __cdecl GetAwayMsg(HCONTACT hContact);

+	virtual	int       __cdecl RecvAwayMsg(HCONTACT hContact, int mode, PROTORECVEVENT* evt);

+	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);

 

-	virtual	int    __cdecl UserIsTyping(HCONTACT hContact, int type);

+	virtual	int       __cdecl UserIsTyping(HCONTACT hContact, int type);

 

-	virtual	int    __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

+	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

 

 	//====| Services |====================================================================

 	INT_PTR  __cdecl SvcCreateAccMgrUI(WPARAM wParam, LPARAM lParam);