- old useless helpers removed from the Options module;

- mir_app functions introduced instead of them;
- OPENOPTIONSDIALOG structure removed from m_options.h

2 files changed, 2 insertions, 7 deletions

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 522b590739..af127f9ae7 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -23,7 +23,6 @@ static HGENMENU hIgnoreItem[9], hProtoItem[MAX_PROTOS];
 HICON hIcons[5];

 BOOL bPopupService = FALSE;

 PROTOACCOUNT **accs;

-OPENOPTIONSDIALOG ood;

 int protoCount;

 int hLangpack;

 

@@ -988,10 +987,6 @@ static int PluginInit(WPARAM, LPARAM)
 		hIgnoreItem[i] = AddSubmenuItem(hmenuIgnore, ii[i].name, Skin_LoadIcon(ii[i].icon), 0, MS_IGNORE, pos++, ii[i].type);

 

 	pos += 100000; // insert separator

-	ood.cbSize = sizeof(ood);

-	ood.pszGroup = "Contacts";

-	ood.pszPage = "Ignore";

-	AddSubmenuItem(hmenuIgnore, LPGENW("Open ignore settings"), IcoLib_GetIcon("miex_ignore"), 0, "Opt/OpenOptions", pos, (INT_PTR)&ood);

 

 	SET_UID(mi, 0x820f4637, 0xbcc4, 0x46b7, 0x9c, 0x67, 0xf9, 0x69, 0xed, 0xc2, 0x46, 0xa2);

 	mi.position++;

diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp
index 2f94374064..997bc2d417 100644
--- a/plugins/MenuItemEx/src/options.cpp
+++ b/plugins/MenuItemEx/src/options.cpp
@@ -107,9 +107,9 @@ int OptionsInit(WPARAM wparam, LPARAM)
 	odp.position = 955000000;

 	odp.hInstance = hinstance;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

-	odp.pszTitle = MODULENAME;

+	odp.szTitle.a = MODULENAME;

 	odp.pfnDlgProc = OptionsProc;

-	odp.pszGroup = LPGEN("Customize");

+	odp.szGroup.a = LPGEN("Customize");

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wparam, &odp);

 	return 0;