- PROTOCOLDESCRIPTOR_V3_SIZE to identify an ANSI plugin;

- absence of fnInitFunc to identify a protocol without instances;
- whole bunch of ansi crutches discarded

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

4 files changed, 8 insertions, 7 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index c4bc303fa9..5a65872b68 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -776,7 +776,7 @@ retry:
 					{

 						// Status was changed by the user simultaneously logged on using different Miranda account or IM client

 						int iStatus = status_gg2m(e->event.status60.status);

-						CallProtoService(m_szModuleName, PS_SETAWAYMSGT, iStatus, (LPARAM)descrT);

+						CallProtoService(m_szModuleName, PS_SETAWAYMSG, iStatus, (LPARAM)descrT);

 						CallProtoService(m_szModuleName, PS_SETSTATUS, iStatus, 0);

 					}

 					

@@ -1060,8 +1060,8 @@ retry:
 					pre.dwFlags = PRFF_TCHAR;

 					pre.fileCount = 1;

 					pre.timestamp = time(NULL);

-					pre.tszDescription = filenameT;

-					pre.ptszFiles = &filenameT;

+					pre.descr.t = filenameT;

+					pre.files.t = &filenameT;

 					pre.lParam = (LPARAM)dcc7;

 					ProtoChainRecvFile((MCONTACT)dcc7->contact, &pre);

 

diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index 3190ac35bb..230784f6c9 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -386,8 +386,8 @@ void __cdecl GGPROTO::dccmainthread(void*)
 								pre.dwFlags = PRFF_TCHAR;

 								pre.fileCount = 1;

 								pre.timestamp = time(NULL);

-								pre.tszDescription = filenameT;

-								pre.ptszFiles = &filenameT;

+								pre.descr.t = filenameT;

+								pre.files.t = &filenameT;

 								pre.lParam = (LPARAM)local_dcc;

 

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 7, "ft_mutex", 1);

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 45fd51745f..0b1aa1d837 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -340,7 +340,8 @@ extern "C" int __declspec(dllexport) Load(void)
    hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, gg_modulesloaded);

 

    // Prepare protocol name

-   PROTOCOLDESCRIPTOR pd = { sizeof(pd) };

+	PROTOCOLDESCRIPTOR pd = { 0 };

+	pd.cbSize = sizeof(pd);

    pd.szName = GGDEF_PROTO;

    pd.fnInit = (pfnInitProto)gg_proto_init;

    pd.fnUninit = (pfnUninitProto)gg_proto_uninit;

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index f4ec6475b2..3c9380a83c 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -57,7 +57,7 @@ GGPROTO::GGPROTO(const char* pszProtoName, const TCHAR* tszUserName) :
 	CreateProtoService(PS_SETMYAVATART, &GGPROTO::setmyavatar);

 

 	CreateProtoService(PS_GETMYAWAYMSG, &GGPROTO::getmyawaymsg);

-	CreateProtoService(PS_SETAWAYMSGT, (MyServiceFunc)&GGPROTO::SetAwayMsg);

+	CreateProtoService(PS_SETAWAYMSG, (MyServiceFunc)&GGPROTO::SetAwayMsg);

 	CreateProtoService(PS_CREATEACCMGRUI, &GGPROTO::get_acc_mgr_gui);

 

 	CreateProtoService(PS_LEAVECHAT, &GGPROTO::leavechat);