From f719c8b921c7a46b76453476204224d40c682914 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 11 Jul 2018 21:32:58 +0300
Subject: int hLangpack/m_hLang removed and replaced with HPLUGIN

---
 plugins/Popup/src/main.cpp      | 5 ++---
 plugins/Popup/src/srmm_menu.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'plugins/Popup/src')

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 7517084fce..e82c40c5fa 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -61,9 +61,8 @@ HANDLE   hTTButton;
 
 static int OptionsInitialize(WPARAM wParam, LPARAM)
 {
-	OPTIONSDIALOGPAGE odp = { 0 };
+	OPTIONSDIALOGPAGE odp = {};
 	odp.position = 100000000;
-	odp.hInstance = g_plugin.getInst();
 	odp.flags = ODPF_BOLDGROUPS;
 	odp.szTitle.a = MODULNAME_PLU;
 
@@ -173,7 +172,7 @@ INT_PTR svcShowHistory(WPARAM, LPARAM)
 
 void InitMenuItems(void)
 {
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	mi.flags = CMIF_UNICODE;
 
 	HANDLE hIcon = GetIconHandle(PopupOptions.ModuleIsEnabled ? IDI_POPUP : IDI_NOPOPUP);
diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp
index aef8080306..2ff5091fba 100644
--- a/plugins/Popup/src/srmm_menu.cpp
+++ b/plugins/Popup/src/srmm_menu.cpp
@@ -110,22 +110,22 @@ void SrmmMenu_Load()
 	sid.dwId = 0;
 	sid.szTooltip = LPGEN("Popup Mode: Auto");
 	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_POPUP);
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	sid.dwId = 1;
 	sid.szTooltip = LPGEN("Popup Mode: Favorite");
 	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_OPT_FAVORITE);
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	sid.dwId = 2;
 	sid.szTooltip = LPGEN("Popup Mode: Ignore fullscreen");
 	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_OPT_FULLSCREEN);
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	sid.dwId = 3;
 	sid.szTooltip = LPGEN("Popup Mode: Block contact");
 	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_NOPOPUP);
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);
 	HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent);
-- 
cgit v1.2.3