4 files changed, 6 insertions, 7 deletions
diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp
index cc47a815f9..d5dc58db0d 100644
--- a/plugins/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/src/mirotrmenu.cpp
@@ -166,7 +166,7 @@ void InitMirOTRMenu(void)
 	Menu_ConfigureObject(hMirOTRMenuObject, MCO_OPT_ONADD_SERVICE, "MIROTRMENUS/OnAddMenuItemMirOTRMenu");
 
 	// menu items
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	mi.flags = CMIF_DISABLED | CMIF_UNICODE;
 	mi.name.w = LPGENW("OTR Status");
 	mi.position = 0;
diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp
index b0cd74e3ba..415fbc58d4 100644
--- a/plugins/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/src/options.cpp
@@ -826,9 +826,8 @@ static INT_PTR CALLBACK DlgProcMirOTROptsFinger(HWND hwndDlg, UINT msg, WPARAM w
 
 static int OpenOptions(WPARAM wParam, LPARAM)
 {
-	OPTIONSDIALOGPAGE odp = { 0 };
+	OPTIONSDIALOGPAGE odp = {};
 	odp.position = 100;
-	odp.hInstance = g_plugin.getInst();
 	odp.szGroup.w = LPGENW("Services");
 	odp.szTitle.w = L"OTR";
 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp
index d375500602..0dc6a16897 100644
--- a/plugins/MirOTR/src/svcs_menu.cpp
+++ b/plugins/MirOTR/src/svcs_menu.cpp
@@ -158,7 +158,7 @@ void InitMenu()
 	CreateServiceFunction(MS_OTR_MENUVERIFY, SVC_VerifyOTR);
 	CreateServiceFunction(MS_OTR_MENUTOGGLEHTML, SVC_ToggleHTMLOTR);
 
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	mi.flags = CMIF_NOTOFFLINE | CMIF_UNICODE;
 	mi.position = -400000;
 
diff --git a/plugins/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/src/svcs_srmm.cpp
index db37ca4f6e..6b4c70d1e5 100644
--- a/plugins/MirOTR/src/svcs_srmm.cpp
+++ b/plugins/MirOTR/src/svcs_srmm.cpp
@@ -86,7 +86,7 @@ void SetEncryptionStatus(MCONTACT hContact, TrustLevel level)
 
 int SVC_ButtonsBarLoaded(WPARAM, LPARAM)
 {
-	Srmm_AddButton(&OTRButton, g_plugin.m_hLang);
+	Srmm_AddButton(&OTRButton, &g_plugin);
 	return 0;
 }
 
@@ -121,12 +121,12 @@ void InitSRMM()
 	sid.hIconDisabled = hIconNotSecure;
 	sid.flags = MBF_DISABLED | MBF_HIDDEN;
 	sid.szTooltip = LANG_OTR_TOOLTIP;
-	Srmm_AddIcon(&sid, g_plugin.m_hLang);
+	Srmm_AddIcon(&sid, &g_plugin);
 
 	sid.dwId = 1;
 	sid.hIcon = hIconPrivate;
 	sid.hIconDisabled = hIconUnverified;
-	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_ICONPRESSED, SVC_IconPressed);