From cf9de21af3073e29cb7b149fbd8427241de70729 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 28 Oct 2016 16:18:50 +0300
Subject: - old useless helpers removed from the Options module; - mir_app
 functions introduced instead of them; - OPENOPTIONSDIALOG structure removed
 from m_options.h

---
 plugins/PluginUpdater/src/Options.cpp | 16 +++++-----------
 plugins/PluginUpdater/src/Utils.cpp   |  5 +----
 2 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'plugins/PluginUpdater')

diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp
index 9a01d64af8..286418d58d 100644
--- a/plugins/PluginUpdater/src/Options.cpp
+++ b/plugins/PluginUpdater/src/Options.cpp
@@ -242,13 +242,7 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar
 			break;
 
 		case IDC_LINK_HOTKEY:
-			{
-				OPENOPTIONSDIALOG ood = {0};
-				ood.cbSize = sizeof(ood);
-				ood.pszGroup = "Customize";
-				ood.pszPage = "Hotkeys";
-				Options_Open(&ood);
-			}
+			Options_Open(L"Customize", L"Hotkeys");
 			return true;
 		}
 		break;
@@ -512,15 +506,15 @@ static int OptInit(WPARAM wParam, LPARAM)
 	odp.hInstance = hInst;
 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_UPDATENOTIFY);
-	odp.pwszGroup = LPGENW("Services");
-	odp.pwszTitle = LPGENW("Plugin Updater");
+	odp.szGroup.w = LPGENW("Services");
+	odp.szTitle.w = LPGENW("Plugin Updater");
 	odp.pfnDlgProc = UpdateNotifyOptsProc;
 	Options_AddPage(wParam, &odp);
 
 	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
-		odp.pwszGroup = LPGENW("Popups");
-		odp.pwszTitle = LPGENW("Plugin Updater");
+		odp.szGroup.w = LPGENW("Popups");
+		odp.szTitle.w = LPGENW("Plugin Updater");
 		odp.pfnDlgProc = DlgPopupOpts;
 		Options_AddPage(wParam, &odp);
 	}
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index 6e88d85783..d23d5503dd 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -316,10 +316,7 @@ bool DownloadFile(FILEURL *pFileURL, HANDLE &nlc)
 
 void __stdcall OpenPluginOptions(void*)
 {
-	OPENOPTIONSDIALOG ood = {0};
-	ood.cbSize = sizeof(ood);
-	ood.pszPage = "Plugins";
-	Options_Open(&ood);
+	Options_Open(L"Plugins");
 }
 
 //   FUNCTION: IsRunAsAdmin()
-- 
cgit v1.2.3