finally CLISTEVENT removed completely

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

2 files changed, 7 insertions, 7 deletions

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index d4bfdbefae..bc25e2f519 100644
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -177,10 +177,10 @@ extern "C" int __declspec(dllexport) Load()
 	CreateServiceFunction("/ImportGPGKeys",ImportGpGKeys);

 

    // !!!!!!!! check it later

-	CLISTMENUITEM mi = { 0 };

+	TMO_MenuItem mi = { 0 };

 	mi.position=-0x7FFFFFFF;

 	mi.flags=CMIF_TCHAR;

-	mi.icolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

+	mi.hIcolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	mi.name.t=LPGENT("Load GPG public key");

 	mi.pszService="/LoadPubKey";

 	hLoadPubKey = Menu_AddContactMenuItem(&mi);

@@ -188,7 +188,7 @@ extern "C" int __declspec(dllexport) Load()
 	memset(&mi, 0, sizeof(mi));

 	mi.position=-0x7FFFFFFe;

 	mi.flags=CMIF_TCHAR;

-	mi.icolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

+	mi.hIcolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	mi.name.t=LPGENT("Toggle GPG encryption");

 	mi.pszService="/ToggleEncryption";

 	hToggleEncryption = Menu_AddContactMenuItem(&mi);

@@ -196,7 +196,7 @@ extern "C" int __declspec(dllexport) Load()
 	memset(&mi, 0, sizeof(mi));

 	mi.position=-0x7FFFFFFd;

 	mi.flags=CMIF_TCHAR;

-	mi.icolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

+	mi.hIcolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	mi.name.t=LPGENT("Send public key");

 	mi.pszService="/SendKey";

 	hSendKey = Menu_AddContactMenuItem(&mi);

@@ -204,7 +204,7 @@ extern "C" int __declspec(dllexport) Load()
 	memset(&mi, 0, sizeof(mi));

 	mi.position=-0x7FFFFFFe;

 	mi.flags=CMIF_TCHAR;

-	mi.icolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

+	mi.hIcolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	mi.name.t=LPGENT("Export GPG Public keys");

 	mi.pszService="/ExportGPGKeys";

 	hExportGpgKeys = Menu_AddMainMenuItem(&mi);

@@ -212,7 +212,7 @@ extern "C" int __declspec(dllexport) Load()
 	memset(&mi, 0, sizeof(mi));

 	mi.position=-0x7FFFFFFF;

 	mi.flags=CMIF_TCHAR;

-	mi.icolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

+	mi.hIcolibItem=Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	mi.name.t=LPGENT("Import GPG Public keys");

 	mi.pszService="/ImportGPGKeys";

 	hImportGpgKeys = Menu_AddMainMenuItem(&mi);

diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index c28eff9c32..9443362054 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -235,7 +235,7 @@ int OnPreBuildContactMenu(WPARAM w, LPARAM l)
 {
 	MCONTACT hContact = db_mc_tryMeta(w);
 	{
-		CLISTMENUITEM mi2 = { 0 };
+		TMO_MenuItem mi2 = { 0 };
 		LPSTR proto = GetContactProto(hContact);
 		PROTOACCOUNT *acc = Proto_GetAccount(proto);
 		std::string setting;