From 9ac20243efe27f58501c59060a4f22c37104c0e3 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 31 May 2015 15:29:24 +0000
Subject: - 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
---
 protocols/MSN/src/msn.cpp          |  3 ++-
 protocols/MSN/src/msn_commands.cpp | 10 +++++-----
 protocols/MSN/src/msn_p2p.cpp      |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'protocols/MSN/src')

diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp
index de2f5bfb3c..1ddd57cb59 100644
--- a/protocols/MSN/src/msn.cpp
+++ b/protocols/MSN/src/msn.cpp
@@ -115,7 +115,8 @@ extern "C" int __declspec(dllexport) Load(void)
 
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
 
-	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
+	PROTOCOLDESCRIPTOR pd = { 0 };
+	pd.cbSize = sizeof(pd);
 	pd.szName = "MSN";
 	pd.fnInit = (pfnInitProto)msnProtoInit;
 	pd.fnUninit = (pfnUninitProto)msnProtoUninit;
diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index ddbf398deb..b9136e636e 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -487,11 +487,11 @@ void CMsnProto::MSN_ProcessURIObject(MCONTACT hContact, ezxml_t xmli)
 				pre.dwFlags = PRFF_TCHAR;
 				pre.fileCount = 1;
 				pre.timestamp = time(NULL);
-				pre.tszDescription = (desc = ezxml_child(xmli, "Description"))?mir_utf8decodeT(desc->txt):tComment;
-				pre.ptszFiles = &ft->std.tszCurrentFile;
+				pre.descr.t = (desc = ezxml_child(xmli, "Description"))?mir_utf8decodeT(desc->txt):tComment;
+				pre.files.t = &ft->std.tszCurrentFile;
 				pre.lParam = (LPARAM)ft;
 				ProtoChainRecvFile(ft->std.hContact, &pre);
-				if (desc) mir_free(pre.tszDescription);
+				if (desc) mir_free(pre.descr.t);
 			} else uri=NULL;
 		}
 
@@ -1439,8 +1439,8 @@ void CMsnProto::MSN_InviteMessage(ThreadData* info, char* msgBody, char* email,
 		pre.dwFlags = PRFF_TCHAR;
 		pre.fileCount = 1;
 		pre.timestamp = time(NULL);
-		pre.tszDescription = tComment;
-		pre.ptszFiles = &ft->std.tszCurrentFile;
+		pre.descr.t = tComment;
+		pre.files.t = &ft->std.tszCurrentFile;
 		pre.lParam = (LPARAM)ft;
 		ProtoChainRecvFile(ft->std.hContact, &pre);
 		return;
diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp
index fbaa187a5c..2aa880dd6a 100644
--- a/protocols/MSN/src/msn_p2p.cpp
+++ b/protocols/MSN/src/msn_p2p.cpp
@@ -1232,8 +1232,8 @@ void CMsnProto::p2p_InitFileTransfer(
 			pre.dwFlags = PRFF_TCHAR;
 			pre.fileCount = 1;
 			pre.timestamp = time(NULL);
-			pre.tszDescription = tComment;
-			pre.ptszFiles = &ft->std.tszCurrentFile;
+			pre.descr.t = tComment;
+			pre.files.t = &ft->std.tszCurrentFile;
 			pre.lParam = (LPARAM)ft;
 			ProtoChainRecvFile(ft->std.hContact, &pre);
 		}
-- 
cgit v1.2.3