int hLangpack/m_hLang removed and replaced with HPLUGIN

7 files changed, 10 insertions, 12 deletions

diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp
index 2f214dc9ce..64cbbea445 100644
--- a/protocols/Gadu-Gadu/src/dialogs.cpp
+++ b/protocols/Gadu-Gadu/src/dialogs.cpp
@@ -693,10 +693,9 @@ static INT_PTR CALLBACK gg_detailsdlgproc(HWND hwndDlg, UINT msg, WPARAM wParam,
 //
 int GaduProto::options_init(WPARAM wParam, LPARAM)
 {
-	OPTIONSDIALOGPAGE odp = { 0 };
+	OPTIONSDIALOGPAGE odp = {};
 	odp.flags = ODPF_UNICODE;
 	odp.position = 1003000;
-	odp.hInstance = g_plugin.getInst();
 	odp.szGroup.w = LPGENW("Network");
 	odp.szTitle.w = m_tszUserName;
 	odp.dwInitParam = (LPARAM)this;
@@ -745,9 +744,8 @@ int GaduProto::details_init(WPARAM wParam, LPARAM lParam)
 		pszTemplate = MAKEINTRESOURCEA(IDD_INFO_GG);
 	}
 
-	OPTIONSDIALOGPAGE odp = { 0 };
+	OPTIONSDIALOGPAGE odp = {};
 	odp.flags = ODPF_DONTTRANSLATE | ODPF_UNICODE;
-	odp.hInstance = g_plugin.getInst();
 	odp.pfnDlgProc = gg_detailsdlgproc;
 	odp.position = -1900000000;
 	odp.pszTemplate = pszTemplate;
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 848f5ba2f0..1910f7b305 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -247,7 +247,7 @@ INT_PTR GaduProto::blockuser(WPARAM hContact, LPARAM)
 //

 void GaduProto::block_init()

 {

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 	SET_UID(mi, 0xc6169b8f, 0x53ab, 0x4242, 0xbe, 0x90, 0xe2, 0x4a, 0xa5, 0x73, 0x88, 0x32);

 	mi.position = -500050000;

 	mi.hIcolibItem = iconList[8].hIcolib;

@@ -273,7 +273,7 @@ void GaduProto::OnBuildProtoMenu()
 {

 	HGENMENU hRoot = Menu_GetProtocolRoot(this);

 

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 	mi.root = hRoot;

 	mi.flags = CMIF_UNICODE;

 

diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index b3124c832c..44e061dc72 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -54,7 +54,7 @@ int GaduProto::gc_init()
 void GaduProto::gc_menus_init(HGENMENU hRoot)

 {

 	if (gc_enabled) {

-		CMenuItem mi(g_plugin);

+		CMenuItem mi(&g_plugin);

 		mi.flags = CMIF_UNICODE;

 		mi.root = hRoot;

 

diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index ad8e4ed499..af471b45f3 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -69,7 +69,7 @@ int gg_img_remove(GGIMAGEDLGDATA *dat);
 int GaduProto::img_init()

 {

 	// Send image contact menu item

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 	SET_UID(mi, 0xab238938, 0xed85, 0x4cfe, 0x93, 0xb5, 0xb8, 0x83, 0xf4, 0x32, 0xa0, 0xec);

 	mi.position = -2000010000;

 	mi.hIcolibItem = iconList[11].hIcolib;

diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp
index 86cb6d6678..e461b82906 100644
--- a/protocols/Gadu-Gadu/src/import.cpp
+++ b/protocols/Gadu-Gadu/src/import.cpp
@@ -535,7 +535,7 @@ INT_PTR GaduProto::export_server(WPARAM, LPARAM)
 //

 void GaduProto::import_init(HGENMENU hRoot)

 {

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 	mi.flags = CMIF_UNICODE;

 	mi.root = hRoot;

 

diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp
index c8fb37df03..7c84a58e56 100644
--- a/protocols/Gadu-Gadu/src/links.cpp
+++ b/protocols/Gadu-Gadu/src/links.cpp
@@ -97,7 +97,7 @@ void gg_links_instancemenu_init()
 	CreateServiceFunction(GGS_MENUCHOOSE, gg_menuchoose);

 	hInstanceMenu = Menu_AddObject("GGAccountChooser", LPGEN("Gadu-Gadu account chooser"), nullptr, GGS_MENUCHOOSE);

 

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 	mi.name.a = "Cancel";

 	mi.position = 9999999;

 	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

@@ -115,7 +115,7 @@ void gg_links_init()
 void GaduProto::links_instance_init()

 {

 	if (ServiceExists(MS_ASSOCMGR_ADDNEWURLTYPE)) {

-		CMenuItem mi(g_plugin);

+		CMenuItem mi(&g_plugin);

 		mi.flags = CMIF_UNICODE;

 		mi.position = CMPlugin::g_arInstances.getCount();

 		mi.name.w = m_tszUserName;

diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp
index 88718c94a1..6d7ae4893e 100644
--- a/protocols/Gadu-Gadu/src/sessions.cpp
+++ b/protocols/Gadu-Gadu/src/sessions.cpp
@@ -418,7 +418,7 @@ BOOL GaduProto::sessions_closedlg()
 

 void GaduProto::sessions_menus_init(HGENMENU hRoot)

 {

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 	mi.flags = CMIF_UNICODE;

 	mi.root = hRoot;