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/NewAwaySysMod/src/AwayOpt.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'plugins/NewAwaySysMod')

diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp
index 70ef7a1389..af6f1498dc 100644
--- a/plugins/NewAwaySysMod/src/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp
@@ -850,10 +850,7 @@ INT_PTR CALLBACK MessagesModernOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 				SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGEDLG_MSGTITLE));
 				break;
 			case IDC_LNK_AUTOAWAY:
-				OPENOPTIONSDIALOG ood = { sizeof(ood) };
-				ood.pszPage = "Status";
-				ood.pszTab = "Autoreply";
-				Options_OpenPage(&ood);
+				Options_OpenPage(NULL, L"Status", L"Autoreply");
 			}
 			break;
 		case EN_CHANGE:
@@ -1234,25 +1231,25 @@ int OptsDlgInit(WPARAM wParam, LPARAM)
 	optDi.hInstance = g_hInstance;
 	optDi.flags = ODPF_BOLDGROUPS;
 
-	optDi.pszTitle = OPT_MAINGROUP;
+	optDi.szTitle.a = OPT_MAINGROUP;
 	optDi.pfnDlgProc = MessagesOptDlg;
 	optDi.pszTemplate = MAKEINTRESOURCEA(IDD_MESSAGES);
-	optDi.pszTab = LPGEN("Status messages");
+	optDi.szTab.a = LPGEN("Status messages");
 	Options_AddPage(wParam, &optDi);
 
 	optDi.pfnDlgProc = MoreOptDlg;
 	optDi.pszTemplate = MAKEINTRESOURCEA(IDD_MOREOPTDIALOG);
-	optDi.pszTab = LPGEN("Main options");
+	optDi.szTab.a = LPGEN("Main options");
 	Options_AddPage(wParam, &optDi);
 
 	optDi.pfnDlgProc = AutoreplyOptDlg;
 	optDi.pszTemplate = MAKEINTRESOURCEA(IDD_AUTOREPLY);
-	optDi.pszTab = LPGEN("Autoreply");
+	optDi.szTab.a = LPGEN("Autoreply");
 	Options_AddPage(wParam, &optDi);
 
 	optDi.pfnDlgProc = ContactsOptDlg;
 	optDi.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACTSOPTDLG);
-	optDi.pszTab = LPGEN("Contacts");
+	optDi.szTab.a = LPGEN("Contacts");
 	Options_AddPage(wParam, &optDi);
 	return 0;
 }
-- 
cgit v1.2.3