- 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

2 files changed, 7 insertions, 6 deletions

diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp
index f757f81a96..603d7d6442 100644
--- a/protocols/Yahoo/src/file_transfer.cpp
+++ b/protocols/Yahoo/src/file_transfer.cpp
@@ -506,12 +506,12 @@ void CYahooProto::ext_got_file(const char *me, const char *who, const char *url,
 	pre.dwFlags = PRFF_TCHAR;

 	pre.fileCount = 1;

 	pre.timestamp = time(NULL);

-	pre.tszDescription = mir_a2t(msg);

-	pre.ptszFiles = &ptszFileName;

+	pre.descr.t = mir_a2t(msg);

+	pre.files.t = &ptszFileName;

 	pre.lParam = (LPARAM)ft;

 	ProtoChainRecvFile(hContact, &pre);

 

-	mir_free(pre.tszDescription);

+	mir_free(pre.descr.t);

 	mir_free(ptszFileName);

 }

 

@@ -550,8 +550,8 @@ void CYahooProto::ext_got_files(const char *me, const char *who, const char *ft_
 	PROTORECVFILET pre = {0};

 	pre.fileCount = 1;

 	pre.timestamp = time(NULL);

-	pre.szDescription = "";

-	pre.pszFiles = (char**)&fn;

+	pre.descr.a = "";

+	pre.files.a = (char**)&fn;

 	pre.lParam = (LPARAM)ft;

 	ProtoChainRecvFile(ft->hContact, &pre);

 }

diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp
index feeb9715c6..9789cf760f 100644
--- a/protocols/Yahoo/src/main.cpp
+++ b/protocols/Yahoo/src/main.cpp
@@ -99,7 +99,8 @@ extern "C" int __declspec(dllexport)Load(void)
 	mir_getLP( &pluginInfo );

 	mir_getCLI();

 	

-	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };

+	PROTOCOLDESCRIPTOR pd = { 0 };

+	pd.cbSize = sizeof(pd);

 	pd.szName = "YAHOO";

 	pd.type   = PROTOTYPE_PROTOCOL;

 	pd.fnInit = ( pfnInitProto )yahooProtoInit;