From b3506557a58f53ed0fc3a96c4ec4a3b8098a542d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 22 Jun 2015 13:35:02 +0000
Subject: - CLISTMENUITEM::cbSize - atavism removed; - code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@14325 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/New_GPG/src/init.cpp      | 6 +-----
 plugins/New_GPG/src/utilities.cpp | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'plugins/New_GPG')

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index 9cb03cc152..3a97c32aae 100644
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -177,7 +177,7 @@ extern "C" int __declspec(dllexport) Load()
 	CreateServiceFunction("/ImportGPGKeys",ImportGpGKeys);
 
    // !!!!!!!! check it later
-	CLISTMENUITEM mi = { sizeof(mi) };
+	CLISTMENUITEM mi = { 0 };
 	mi.position=-0x7FFFFFFF;
 	mi.flags=CMIF_TCHAR;
 	mi.hIcon=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
@@ -186,7 +186,6 @@ extern "C" int __declspec(dllexport) Load()
 	hLoadPubKey = Menu_AddContactMenuItem(&mi);
 
 	memset(&mi, 0, sizeof(mi));
-	mi.cbSize=sizeof(mi);
 	mi.position=-0x7FFFFFFe;
 	mi.flags=CMIF_TCHAR;
 	mi.hIcon=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
@@ -195,7 +194,6 @@ extern "C" int __declspec(dllexport) Load()
 	hToggleEncryption = Menu_AddContactMenuItem(&mi);
 
 	memset(&mi, 0, sizeof(mi));
-	mi.cbSize=sizeof(mi);
 	mi.position=-0x7FFFFFFd;
 	mi.flags=CMIF_TCHAR;
 	mi.hIcon=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
@@ -204,7 +202,6 @@ extern "C" int __declspec(dllexport) Load()
 	hSendKey = Menu_AddContactMenuItem(&mi);
 
 	memset(&mi, 0, sizeof(mi));
-	mi.cbSize=sizeof(mi);
 	mi.position=-0x7FFFFFFe;
 	mi.flags=CMIF_TCHAR;
 	mi.hIcon=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
@@ -213,7 +210,6 @@ extern "C" int __declspec(dllexport) Load()
 	hExportGpgKeys = Menu_AddMainMenuItem(&mi);
 
 	memset(&mi, 0, sizeof(mi));
-	mi.cbSize=sizeof(mi);
 	mi.position=-0x7FFFFFFF;
 	mi.flags=CMIF_TCHAR;
 	mi.hIcon=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index df16fde641..4c49c3eb4a 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -227,7 +227,7 @@ INT_PTR ToggleEncryption(WPARAM w, LPARAM l)
 	setSrmmIcon(hContact);
 	setClistIcon(hContact);
 	enc = enc?0:1;
-	CLISTMENUITEM mi = { sizeof(mi) };
+	CLISTMENUITEM mi = { 0 };
 	mi.flags = CMIM_NAME;
 	enc?mi.pszName="Turn off GPG encryption":mi.pszName="Turn on GPG encryption";
 	Menu_ModifyItem(hToggleEncryption, &mi);
@@ -238,7 +238,7 @@ int OnPreBuildContactMenu(WPARAM w, LPARAM l)
 {
 	MCONTACT hContact = db_mc_tryMeta(w);
 	{
-		CLISTMENUITEM mi2 = { sizeof(mi2) };
+		CLISTMENUITEM mi2 = { 0 };
 		LPSTR proto = GetContactProto(hContact);
 		PROTOACCOUNT *acc = Proto_GetAccount(proto);
 		std::string setting;
@@ -263,7 +263,7 @@ int OnPreBuildContactMenu(WPARAM w, LPARAM l)
 		mi2.flags = CMIM_NAME | CMIF_TCHAR;
 		Menu_ModifyItem(hSendKey, &mi2);
 	}
-	CLISTMENUITEM mi = { sizeof(mi) };
+	CLISTMENUITEM mi = { 0 };
 	mi.flags = CMIM_NAME;
 	TCHAR *tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
 	if(!tmp[0])
-- 
cgit v1.2.3