another bunch of crutches buried in a trash can: PROTOCHAR & PROTOFILEEVENT

glory, glory, hallelujah

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

3 files changed, 15 insertions, 15 deletions

diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index 230784f6c9..23f56f4a5b 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -658,7 +658,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 	debugLogA("dccmainthread(): end. DCC Server Thread Ending");

 }

 

-HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath)

+HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const TCHAR* szPath)

 {

 	struct gg_dcc *dcc = (struct gg_dcc *) hTransfer;

 	char fileName[MAX_PATH], *path = mir_t2a(szPath);

@@ -698,7 +698,7 @@ HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath)
 	return hTransfer;

 }

 

-HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath)

+HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const TCHAR* szPath)

 {

 	struct gg_dcc7 *dcc7 = (struct gg_dcc7 *) hTransfer;

 	char fileName[MAX_PATH], *path = mir_t2a(szPath);

@@ -849,7 +849,7 @@ int GGPROTO::dcc7filecancel(HANDLE hTransfer)
 ////////////////////////////////////////////////////////////

 // File receiving allowed

 

-HANDLE GGPROTO::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath)

+HANDLE GGPROTO::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath)

 {

 	// Check if its proper dcc

 	struct gg_common *c = (struct gg_common *) hTransfer;

@@ -881,7 +881,7 @@ int GGPROTO::FileCancel(MCONTACT hContact, HANDLE hTransfer)
 ////////////////////////////////////////////////////////////

 // File receiving denied

 

-int GGPROTO::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason)

+int GGPROTO::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason)

 {

 	// Check if its proper dcc

 	struct gg_common *c = (struct gg_common *) hTransfer;

@@ -897,7 +897,7 @@ int GGPROTO::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szRe
 ////////////////////////////////////////////////////////////

 // Called when received an file

 

-int GGPROTO::RecvFile(MCONTACT hContact, PROTOFILEEVENT* pre)

+int GGPROTO::RecvFile(MCONTACT hContact, PROTORECVFILET* pre)

 {

 	return Proto_RecvFile(hContact, pre);

 }

@@ -905,7 +905,7 @@ int GGPROTO::RecvFile(MCONTACT hContact, PROTOFILEEVENT* pre)
 ////////////////////////////////////////////////////////////

 // Called when user sends a file

 

-HANDLE GGPROTO::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles)

+HANDLE GGPROTO::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles)

 {

 	char *bslash, *filename;

 	struct gg_dcc *dcc;

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index 2d0dfd6702..22f4c18ecf 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -262,7 +262,7 @@ void __cdecl GGPROTO::searchthread(void *)
 #endif

 }

 

-HANDLE GGPROTO::SearchBasic(const PROTOCHAR *id)

+HANDLE GGPROTO::SearchBasic(const TCHAR *id)

 {

 	if (!isonline())

 		return (HANDLE)0;

@@ -300,7 +300,7 @@ HANDLE GGPROTO::SearchBasic(const PROTOCHAR *id)
 //////////////////////////////////////////////////////////

 // search by details

 

-HANDLE GGPROTO::SearchByName(const PROTOCHAR *nick, const PROTOCHAR *firstName, const PROTOCHAR *lastName)

+HANDLE GGPROTO::SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName)

 {

 	// Check if connected and if there's a search data

 	if (!isonline())

@@ -646,7 +646,7 @@ HANDLE GGPROTO::GetAwayMsg(MCONTACT hContact)
 // when away message is being set

 // registered as ProtoService PS_SETAWAYMSGT

 

-int GGPROTO::SetAwayMsg(int iStatus, const PROTOCHAR *newMsg)

+int GGPROTO::SetAwayMsg(int iStatus, const TCHAR *newMsg)

 {

 	int status = gg_normalizestatus(iStatus);

 	TCHAR **msgPtr;

diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h
index b3bc689d46..45a1ec9899 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.h
+++ b/protocols/Gadu-Gadu/src/gg_proto.h
@@ -136,14 +136,14 @@ struct GGPROTO : public PROTO<GGPROTO>
 	void     __cdecl setavatarthread(void*);

 

 	/* File transfer functions */

-	HANDLE fileallow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath);

+	HANDLE fileallow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath);

 	int filecancel(MCONTACT hContact, HANDLE hTransfer);

-	int filedeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason);

-	int recvfile(MCONTACT hContact, PROTOFILEEVENT* pre);

-	HANDLE sendfile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles);

+	int filedeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason);

+	int recvfile(MCONTACT hContact, PROTORECVFILET* pre);

+	HANDLE sendfile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles);

 

-	HANDLE dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath);

-	HANDLE dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath);

+	HANDLE dccfileallow(HANDLE hTransfer, const TCHAR* szPath);

+	HANDLE dcc7fileallow(HANDLE hTransfer, const TCHAR* szPath);

 

 	int dccfiledeny(HANDLE hTransfer);

 	int dcc7filedeny(HANDLE hTransfer);