- old useless helpers removed from the Options module;

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

1 files changed, 6 insertions, 6 deletions

diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index be5634e4aa..8212b26338 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
@@ -627,25 +627,25 @@ int CMsnProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	odp.position = -790000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN);

-	odp.pwszTitle = m_tszUserName;

-	odp.pwszGroup = LPGENW("Network");

-	odp.pwszTab = LPGENW("Account");

+	odp.szTitle.w = m_tszUserName;

+	odp.szGroup.w = LPGENW("Network");

+	odp.szTab.w = LPGENW("Account");

 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;

 	odp.pfnDlgProc = DlgProcMsnOpts;

 	odp.dwInitParam = (LPARAM)this;

 	Options_AddPage(wParam, &odp);

 

-	odp.pwszTab = LPGENW("Connection");

+	odp.szTab.w = LPGENW("Connection");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN_CONN);

 	odp.pfnDlgProc = DlgProcMsnConnOpts;

 	Options_AddPage(wParam, &odp);

 

-	odp.pwszTab = LPGENW("Server list");

+	odp.szTab.w = LPGENW("Server list");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_LISTSMGR);

 	odp.pfnDlgProc = DlgProcMsnServLists;

 	Options_AddPage(wParam, &odp);

 

-	odp.pwszTab = LPGENW("Notifications");

+	odp.szTab.w = LPGENW("Notifications");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);

 	odp.pfnDlgProc = DlgProcHotmailPopupOpts;

 	Options_AddPage(wParam, &odp);