m_genmenu.h unbound from hLangpack

3 files changed, 9 insertions, 9 deletions

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 913f9330fa..3b8f9c0fac 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -152,7 +152,7 @@ void g_MenuInit(void)
 

 	hChooserMenu = Menu_AddObject("JabberAccountChooser", LPGEN("Jabber account chooser"), nullptr, "Jabber/MenuChoose");

 	{

-		CMenuItem mi;

+		CMenuItem mi(g_plugin);

 		mi.name.a = "Cancel";

 		mi.position = 9999999;

 		mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

@@ -162,7 +162,7 @@ void g_MenuInit(void)
 	//////////////////////////////////////////////////////////////////////////////////////

 	// Contact menu initialization

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.flags = CMIF_UNMOVABLE;

 

 	// "Convert Chat/Contact"

@@ -370,7 +370,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
 	}

 

 	char text[256];

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.flags = CMIF_SYSTEM;

 	mi.pszService = text;

 

@@ -530,7 +530,7 @@ INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd(WPARAM hContact, LPARAM)
 

 void CJabberProto::OnBuildProtoMenu()

 {

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.root = m_hMenuRoot = Menu_GetProtocolRoot(this);

 	mi.flags = CMIF_UNMOVABLE;

 

@@ -659,7 +659,7 @@ void CJabberProto::BuildPriorityMenu()
 	if (m_hMenuPriorityRoot)

 		Menu_RemoveItem(m_hMenuPriorityRoot);

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.pszService = nullptr;

 	mi.position = 200006;

 	mi.root = m_hMenuRoot;

@@ -729,7 +729,7 @@ void CJabberProto::GlobalMenuInit()
 	//////////////////////////////////////////////////////////////////////////////////////

 	// Account chooser menu

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.flags = CMIF_UNMOVABLE | CMIF_UNICODE | CMIF_KEEPUNTRANSLATED;

 	mi.position = iChooserMenuPos++;

 	mi.name.w = m_tszUserName;

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index addd488905..f6645bf2e3 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -2090,7 +2090,7 @@ INT_PTR __cdecl CJabberProto::menuSetPrivacyList(WPARAM, LPARAM, LPARAM iList)
 

 void CJabberProto::BuildPrivacyMenu()

 {

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.position = 200005;

 	mi.hIcolibItem = GetIconHandle(IDI_AGENTS);

 	mi.flags = CMIF_UNMOVABLE | CMIF_HIDDEN;

@@ -2120,7 +2120,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld)
 

 	char srvFce[MAX_PATH + 64];

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.position = 2000040000;

 	mi.flags = CMIF_UNMOVABLE | CMIF_UNICODE;

 	mi.root = m_hPrivacyMenuRoot;

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 070af7048e..1825a3714d 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -468,7 +468,7 @@ void CPepGuiService::RebuildMenu()
 	char szService[128];

 	mir_snprintf(szService, "/AdvStatusSet/%s", m_name);

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.root = hJabberRoot;

 	mi.pszService = szService;

 	mi.position = 200010;