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/SecureIM/src/main.cpp         | 4 ++--
 plugins/SecureIM/src/options.cpp      | 3 +--
 plugins/SecureIM/src/popupOptions.cpp | 3 +--
 plugins/SecureIM/src/svcs_srmm.cpp    | 8 ++++----
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'plugins/SecureIM/src')

diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 6dd6706a23..35bd01a72d 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -26,7 +26,7 @@ CMPlugin::CMPlugin() :
 
 static HGENMENU MyAddMenuItem(LPCWSTR name, int pos, LPCSTR szUid, HICON hicon, LPCSTR service, int flags = 0, WPARAM wParam = 0)
 {
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	mi.flags = flags | CMIF_HIDDEN | CMIF_UNICODE;
 	mi.position = pos;
 	mi.hIcolibItem = hicon;
@@ -39,7 +39,7 @@ static HGENMENU MyAddMenuItem(LPCWSTR name, int pos, LPCSTR szUid, HICON hicon,
 
 static HGENMENU MyAddSubItem(HGENMENU hRoot, LPCSTR name, int pos, int poppos, LPCSTR service, WPARAM wParam = 0)
 {
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	mi.flags = CMIF_HIDDEN | CMIF_SYSTEM;
 	mi.position = pos;
 	mi.name.a = (char*)name;
diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp
index 789a7bf667..89fce2390d 100644
--- a/plugins/SecureIM/src/options.cpp
+++ b/plugins/SecureIM/src/options.cpp
@@ -1686,8 +1686,7 @@ BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)
 
 int onRegisterOptions(WPARAM wParam, LPARAM)
 {
-	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.hInstance = g_plugin.getInst();
+	OPTIONSDIALOGPAGE odp = {};
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSTAB);
 	odp.szTitle.a = (char*)MODULENAME;
 	odp.szGroup.a = LPGEN("Services");
diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp
index 8f799ea352..6082ed09cc 100644
--- a/plugins/SecureIM/src/popupOptions.cpp
+++ b/plugins/SecureIM/src/popupOptions.cpp
@@ -162,8 +162,7 @@ void RefreshPopupOptionsDlg(HWND hec, HWND hdc, HWND hss, HWND hsr, HWND hks, HW
 int onRegisterPopOptions(WPARAM wParam, LPARAM)
 {
 	if (bPopupExists) {
-		OPTIONSDIALOGPAGE odp = { 0 };
-		odp.hInstance = g_plugin.getInst();
+		OPTIONSDIALOGPAGE odp = {};
 		odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUP);
 		odp.szTitle.a = (char*)MODULENAME;
 		odp.szGroup.a = LPGEN("Popups");
diff --git a/plugins/SecureIM/src/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp
index 4fe6189727..1d9f0f065f 100644
--- a/plugins/SecureIM/src/svcs_srmm.cpp
+++ b/plugins/SecureIM/src/svcs_srmm.cpp
@@ -40,28 +40,28 @@ void InitSRMMIcons()
 	sid.hIcon = mode2icon(MODE_NATIVE | SECURED, 3);
 	sid.hIconDisabled = mode2icon(MODE_NATIVE, 3);
 	sid.szTooltip = LPGEN("SecureIM [Native]");
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	// PGP
 	sid.dwId = MODE_PGP;
 	sid.hIcon = mode2icon(MODE_PGP | SECURED, 3);
 	sid.hIconDisabled = mode2icon(MODE_PGP, 3);
 	sid.szTooltip = LPGEN("SecureIM [PGP]");
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	// GPG
 	sid.dwId = MODE_GPG;
 	sid.hIcon = mode2icon(MODE_GPG | SECURED, 3);
 	sid.hIconDisabled = mode2icon(MODE_GPG, 3);
 	sid.szTooltip = LPGEN("SecureIM [GPG]");
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	// RSAAES
 	sid.dwId = MODE_RSAAES;
 	sid.hIcon = mode2icon(MODE_RSAAES | SECURED, 3);
 	sid.hIconDisabled = mode2icon(MODE_RSAAES, 3);
 	sid.szTooltip = LPGEN("SecureIM [RSA/AES]");
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	// hook the window events so that we can can change the status of the icon
 	HookEvent(ME_MSG_WINDOWEVENT, onWindowEvent);
-- 
cgit v1.2.3