From 3f23417a1099f73dc28ec1b7d6ec2a1a7fc2b7a2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 18 Jun 2012 20:53:59 +0000
Subject: - PLUGININFO structure removed at all; - Options_AddPage &
 UserInfo_AddPage replaced MS_OPT_ADDPAGE & MS_USERINFO_ADDPAGE services
 respectively - total internal redesign of options' translation - code
 reformatting

git-svn-id: http://svn.miranda-ng.org/main/trunk@477 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MSN/msn_opts.cpp     | 20 +++++++++-----------
 protocols/MSN/msn_useropts.cpp |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'protocols/MSN')

diff --git a/protocols/MSN/msn_opts.cpp b/protocols/MSN/msn_opts.cpp
index a15f956439..11d077c52c 100644
--- a/protocols/MSN/msn_opts.cpp
+++ b/protocols/MSN/msn_opts.cpp
@@ -720,7 +720,6 @@ INT_PTR CALLBACK DlgDeleteContactUI(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam)
 {
 	OPTIONSDIALOGPAGE odp = {0};
-
 	odp.cbSize      = sizeof(odp);
 	odp.position    = -790000000;
 	odp.hInstance   = hInst;
@@ -731,22 +730,22 @@ int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam)
 	odp.flags       = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
 	odp.pfnDlgProc  = DlgProcMsnOpts;
 	odp.dwInitParam = (LPARAM)this;
-	MSN_CallService(MS_OPT_ADDPAGE, wParam,(LPARAM)&odp);
+	Options_AddPage(wParam,&odp);
 
 	odp.ptszTab     = LPGENT("Connection");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN_CONN);
 	odp.pfnDlgProc  = DlgProcMsnConnOpts;
-	MSN_CallService(MS_OPT_ADDPAGE, wParam,(LPARAM)&odp);
+	Options_AddPage(wParam,&odp);
 
-	odp.ptszTab      = LPGENT("Server list");
+	odp.ptszTab     = LPGENT("Server list");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_LISTSMGR);
 	odp.pfnDlgProc  = DlgProcMsnServLists;
-	MSN_CallService(MS_OPT_ADDPAGE, wParam,(LPARAM)&odp);
+	Options_AddPage(wParam,&odp);
 
 	odp.ptszTab     = LPGENT("Notifications");
-	odp.pszTemplate	= MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
-	odp.pfnDlgProc	= DlgProcHotmailPopUpOpts;
-	MSN_CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp);
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
+	odp.pfnDlgProc  = DlgProcHotmailPopUpOpts;
+	Options_AddPage(wParam, &odp);
 
 	return 0;
 }
@@ -761,7 +760,7 @@ INT_PTR CMsnProto::SvcCreateAccMgrUI(WPARAM wParam, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////
 // Load resident option values into memory
 
-void  CMsnProto::LoadOptions(void)
+void CMsnProto::LoadOptions(void)
 {
 	memset(&MyOptions, 0, sizeof(MyOptions));
 
@@ -773,8 +772,7 @@ void  CMsnProto::LoadOptions(void)
 		MyOptions.szEmail[0] = 0;
 	_strlwr(MyOptions.szEmail);
 
-	if (getStaticString(NULL, "MachineGuid", MyOptions.szMachineGuid, sizeof(MyOptions.szMachineGuid)))
-	{
+	if (getStaticString(NULL, "MachineGuid", MyOptions.szMachineGuid, sizeof(MyOptions.szMachineGuid))) {
 		char* uuid = getNewUuid();
 		strcpy(MyOptions.szMachineGuid, uuid);
 		setString("MachineGuid", MyOptions.szMachineGuid);
diff --git a/protocols/MSN/msn_useropts.cpp b/protocols/MSN/msn_useropts.cpp
index 1462224783..d8d247cf4b 100644
--- a/protocols/MSN/msn_useropts.cpp
+++ b/protocols/MSN/msn_useropts.cpp
@@ -70,7 +70,7 @@ int MsnOnDetailsInit(WPARAM wParam, LPARAM lParam)
 		odp.ptszTitle   = m_tszUserName;
 		odp.flags       = ODPF_TCHAR | ODPF_DONTTRANSLATE;
 
-		MSN_CallService(MS_USERINFO_ADDPAGE, wParam, (LPARAM)&odp);
+		UserInfo_AddPage(wParam, &odp);
 	}
 */	
 	return 0;
-- 
cgit v1.2.3