From dd1460d664f7266920b07527f25f87ec8233daaf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 25 Sep 2013 10:58:24 +0000
Subject: valid options initialization

git-svn-id: http://svn.miranda-ng.org/main/trunk@6225 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_opt.cpp      | 26 ++++++++++++--------------
 protocols/JabberG/src/jabber_userinfo.cpp |  1 -
 protocols/JabberG/src/jabber_vcard.cpp    |  3 +--
 3 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'protocols/JabberG/src')

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 2062c06c12..43b48918fa 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -1571,37 +1571,35 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleRosterControl(WPARAM, LPARAM)
 
 int CJabberProto::OnOptionsInit(WPARAM wParam, LPARAM)
 {
-	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.cbSize      = sizeof(odp);
-	odp.hInstance   = hInst;
-	odp.ptszGroup   = LPGENT("Network");
-	odp.ptszTitle   = m_tszUserName;
-	odp.flags       = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
-
-	odp.ptszTab     = LPGENT("Account");
+	OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+	odp.hInstance = hInst;
+	odp.ptszGroup = LPGENT("Network");
+	odp.ptszTitle = m_tszUserName;
+	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
+
+	odp.ptszTab = LPGENT("Account");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_JABBER);
-	odp.pfnDlgProc  = CDlgBase::DynamicDlgProc;
+	odp.pfnDlgProc = CDlgBase::DynamicDlgProc;
 	odp.dwInitParam = (LPARAM)&OptCreateAccount;
 	OptCreateAccount.create = CDlgOptAccount::Create;
 	OptCreateAccount.param = this;
 	Options_AddPage(wParam, &odp);
 
-	odp.ptszTab     = LPGENT("Conferences");
+	odp.ptszTab = LPGENT("Conferences");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_JABBER4);
-	odp.pfnDlgProc  = CDlgBase::DynamicDlgProc;
+	odp.pfnDlgProc = CDlgBase::DynamicDlgProc;
 	odp.dwInitParam = (LPARAM)&OptCreateGc;
 	OptCreateGc.create = CDlgOptGc::Create;
 	OptCreateGc.param = this;
 	Options_AddPage(wParam, &odp);
 
-	odp.ptszTab     = LPGENT("Advanced");
+	odp.ptszTab = LPGENT("Advanced");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_JABBER2);
-	odp.pfnDlgProc  = CDlgBase::DynamicDlgProc;
+	odp.pfnDlgProc = CDlgBase::DynamicDlgProc;
 	odp.dwInitParam = (LPARAM)&OptCreateAdvanced;
 	OptCreateAdvanced.create = CDlgOptAdvanced::Create;
 	OptCreateAdvanced.param = this;
 	Options_AddPage(wParam, &odp);
-
 	return 0;
 }
 
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 986213bf90..ee67004503 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -865,7 +865,6 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
 		odp.pszTitle = 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 89a5e69c88..022725d273 100644
--- a/protocols/JabberG/src/jabber_vcard.cpp
+++ b/protocols/JabberG/src/jabber_vcard.cpp
@@ -1209,8 +1209,7 @@ void CJabberProto::OnUserInfoInit_VCard(WPARAM wParam, LPARAM)
 	m_bPhotoChanged = FALSE;
 	m_szPhotoFileName[0] = 0;
 
-	OPTIONSDIALOGPAGE odp = {0};
-	odp.cbSize = sizeof(odp);
+	OPTIONSDIALOGPAGE odp = { sizeof(odp) };
 	odp.hInstance = hInst;
 	odp.dwInitParam = (LPARAM)this;
 	odp.flags = ODPF_TCHAR|ODPF_USERINFOTAB|ODPF_DONTTRANSLATE;
-- 
cgit v1.2.3