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

---
 protocols/JabberG/src/jabber_opt.cpp      | 19 ++++++-------------
 protocols/JabberG/src/jabber_userinfo.cpp |  4 ++--
 protocols/JabberG/src/jabber_vcard.cpp    | 14 +++++++-------
 3 files changed, 15 insertions(+), 22 deletions(-)

(limited to 'protocols/JabberG/src')

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 2959ff5603..5ea705adfc 100755
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -1508,19 +1508,19 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleRosterControl(WPARAM, LPARAM)
 int CJabberProto::OnOptionsInit(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.pwszGroup = LPGENW("Network");
-	odp.pwszTitle = m_tszUserName;
+	odp.szGroup.w = LPGENW("Network");
+	odp.szTitle.w = m_tszUserName;
 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
 
-	odp.pwszTab = LPGENW("Account");
+	odp.szTab.w = LPGENW("Account");
 	odp.pDialog = new CDlgOptAccount(this);
 	Options_AddPage(wParam, &odp);
 
-	odp.pwszTab = LPGENW("Conferences");
+	odp.szTab.w = LPGENW("Conferences");
 	odp.pDialog = new CDlgOptGc(this);
 	Options_AddPage(wParam, &odp);
 
-	odp.pwszTab = LPGENW("Advanced");
+	odp.szTab.w = LPGENW("Advanced");
 	odp.pDialog = new CDlgOptAdvanced(this);
 	Options_AddPage(wParam, &odp);
 	return 0;
@@ -2225,14 +2225,7 @@ void CJabberProto::JabberUpdateDialogs(BOOL)
 
 INT_PTR __cdecl CJabberProto::OnMenuOptions(WPARAM, LPARAM)
 {
-	OPENOPTIONSDIALOG ood = { 0 };
-	ood.cbSize = sizeof(ood);
-	ood.pszGroup = "Network";
-	ood.pszPage = mir_u2a(m_tszUserName);
-	ood.pszTab = "Account";
-	Options_Open(&ood);
-
-	mir_free((void*)ood.pszPage);
+	Options_Open(L"Network", m_tszUserName, L"Account");
 	return 0;
 }
 
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index bd464df117..aa26e63ff3 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -818,13 +818,13 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
 		odp.pfnDlgProc = JabberUserInfoDlgProc;
 		odp.position = -2000000000;
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_JABBER);
-		odp.pszTitle = LPGEN("Account");
+		odp.szTitle.a = LPGEN("Account");
 		UserInfo_AddPage(wParam, &odp);
 
 		odp.pfnDlgProc = JabberUserPhotoDlgProc;
 		odp.position = 2000000000;
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PHOTO);
-		odp.pszTitle = LPGEN("Photo");
+		odp.szTitle.a = LPGEN("Photo");
 		UserInfo_AddPage(wParam, &odp);
 	}
 	return 0;
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp
index e4a6b04931..fd8b47928e 100644
--- a/protocols/JabberG/src/jabber_vcard.cpp
+++ b/protocols/JabberG/src/jabber_vcard.cpp
@@ -1188,36 +1188,36 @@ void CJabberProto::OnUserInfoInit_VCard(WPARAM wParam, LPARAM)
 	odp.hInstance = hInst;
 	odp.dwInitParam = (LPARAM)this;
 	odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB | ODPF_DONTTRANSLATE;
-	odp.pwszTitle = m_tszUserName;
+	odp.szTitle.w = m_tszUserName;
 
 	odp.pfnDlgProc = PersonalDlgProc;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PERSONAL);
-	odp.pwszTab = LPGENW("General");
+	odp.szTab.w = LPGENW("General");
 	UserInfo_AddPage(wParam, &odp);
 
 	odp.pfnDlgProc = ContactDlgProc;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_CONTACT);
-	odp.pwszTab = LPGENW("Contacts");
+	odp.szTab.w = LPGENW("Contacts");
 	UserInfo_AddPage(wParam, &odp);
 
 	odp.pfnDlgProc = HomeDlgProc;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_HOME);
-	odp.pwszTab = LPGENW("Home");
+	odp.szTab.w = LPGENW("Home");
 	UserInfo_AddPage(wParam, &odp);
 
 	odp.pfnDlgProc = WorkDlgProc;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_WORK);
-	odp.pwszTab = LPGENW("Work");
+	odp.szTab.w = LPGENW("Work");
 	UserInfo_AddPage(wParam, &odp);
 
 	odp.pfnDlgProc = PhotoDlgProc;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PHOTO);
-	odp.pwszTab = LPGENW("Photo");
+	odp.szTab.w = LPGENW("Photo");
 	UserInfo_AddPage(wParam, &odp);
 
 	odp.pfnDlgProc = NoteDlgProc;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_NOTE);
-	odp.pwszTab = LPGENW("Note");
+	odp.szTab.w = LPGENW("Note");
 	UserInfo_AddPage(wParam, &odp);
 
 	SendGetVcard(m_szJabberJID);
-- 
cgit v1.2.3