From dd1460d664f7266920b07527f25f87ec8233daaf Mon Sep 17 00:00:00 2001 From: George Hazan 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/AimOscar/src/ui.cpp | 7 +-- protocols/EmLanProto/src/amdproto.cpp | 1 - protocols/FacebookRM/src/proto.cpp | 1 - protocols/GTalkExt/src/options.cpp | 2 - protocols/Gadu-Gadu/src/dialogs.cpp | 4 +- protocols/IRCG/src/options.cpp | 4 +- protocols/IRCG/src/userinfo.cpp | 3 +- protocols/IcqOscarJ/src/UI/userinfotab.cpp | 6 +-- protocols/IcqOscarJ/src/icq_opts.cpp | 3 +- protocols/JabberG/src/jabber_opt.cpp | 26 +++++----- protocols/JabberG/src/jabber_userinfo.cpp | 1 - protocols/JabberG/src/jabber_vcard.cpp | 3 +- protocols/MRA/src/Mra_options.cpp | 3 +- protocols/MSN/msn_10.vcxproj | 1 - protocols/MSN/msn_10.vcxproj.filters | 3 -- protocols/MSN/msn_11.vcxproj | 1 - protocols/MSN/msn_11.vcxproj.filters | 3 -- protocols/MSN/src/msn_opts.cpp | 3 +- protocols/MSN/src/msn_useropts.cpp | 79 ------------------------------ protocols/Omegle/src/proto.cpp | 3 +- protocols/Skype/src/skype_events.cpp | 16 ++---- protocols/Twitter/src/proto.cpp | 6 +-- protocols/Xfire/src/options.cpp | 1 - protocols/Xfire/src/userdetails.cpp | 8 +-- protocols/Yahoo/src/options.cpp | 5 +- protocols/Yahoo/src/user_info.cpp | 7 +-- 26 files changed, 34 insertions(+), 166 deletions(-) delete mode 100644 protocols/MSN/src/msn_useropts.cpp (limited to 'protocols') diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp index 9e5a82cab0..fe5b2f256f 100644 --- a/protocols/AimOscar/src/ui.cpp +++ b/protocols/AimOscar/src/ui.cpp @@ -746,8 +746,7 @@ int CAimProto::OnUserInfoInit(WPARAM wParam,LPARAM lParam) { if (!lParam)//hContact { - OPTIONSDIALOGPAGE odp = { 0 }; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.position = -1900000000; odp.flags = ODPF_USERINFOTAB | ODPF_TCHAR; odp.hInstance = hInstance; @@ -1141,8 +1140,7 @@ static INT_PTR CALLBACK privacy_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP int CAimProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { 0 }; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.position = 1003000; odp.hInstance = hInstance; odp.ptszGroup = LPGENT("Network"); @@ -1159,7 +1157,6 @@ int CAimProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_PRIVACY); odp.pfnDlgProc = privacy_dialog; Options_AddPage(wParam, &odp); - return 0; } diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index ada5f38202..29e286a969 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -292,7 +292,6 @@ int __cdecl EMPCreateOptionsDlg(WPARAM wParam,LPARAM) odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = EMPDlgProcMainOpts; Options_AddPage(wParam, &odp); - return 0; } diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index bd2dd4e071..b35a1e230e 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -427,7 +427,6 @@ int FacebookProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_ADVANCED); odp.pfnDlgProc = FBOptionsAdvancedProc; Options_AddPage(wParam, &odp); - return 0; } diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp index 7cf97347b8..ade91850e9 100644 --- a/protocols/GTalkExt/src/options.cpp +++ b/protocols/GTalkExt/src/options.cpp @@ -242,7 +242,6 @@ void AddPopupsPage(WPARAM wParam) odp.hInstance = g_hInst; odp.ptszGroup = POPUPS_OPTIONS_GROUP; odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB; - Options_AddPage(wParam, &odp); } @@ -257,7 +256,6 @@ void AddAccPage(LPTSTR acc, LPCSTR mod, WPARAM wParam) odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB | ODPF_DONTTRANSLATE; odp.ptszTab = MAIL_NOTIFICATIONS; odp.dwInitParam = (LPARAM)mod; - Options_AddPage(wParam, &odp); } diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp index ffc5c96f4e..771796230f 100644 --- a/protocols/Gadu-Gadu/src/dialogs.cpp +++ b/protocols/Gadu-Gadu/src/dialogs.cpp @@ -153,8 +153,7 @@ static void SetValue(HWND hwndDlg, int idCtrl, HANDLE hContact, char *szModule, int GGPROTO::options_init(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { 0 }; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.flags = ODPF_TCHAR; odp.position = 1003000; odp.hInstance = hInstance; @@ -177,7 +176,6 @@ int GGPROTO::options_init(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GG_ADVANCED); odp.pfnDlgProc = gg_advoptsdlgproc; Options_AddPage(wParam, &odp); - return 0; } diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index fcca7bbc3f..ea5e4e116c 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1658,9 +1658,7 @@ void CIgnorePrefsDlg::UpdateList() int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM) { - OPTIONSDIALOGPAGE odp = { 0 }; - - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_PREFS_CONNECT); odp.ptszTitle = m_tszUserName; diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp index 46432e6166..e3ac6f23c3 100644 --- a/protocols/IRCG/src/userinfo.cpp +++ b/protocols/IRCG/src/userinfo.cpp @@ -208,8 +208,7 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam) db_free(&dbv); } - OPTIONSDIALOGPAGE odp = { 0 }; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.flags = ODPF_DONTTRANSLATE; odp.pszTitle = m_szModuleName; odp.hIcon = NULL; diff --git a/protocols/IcqOscarJ/src/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp index e8a8e01b34..d913bc50f4 100644 --- a/protocols/IcqOscarJ/src/UI/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp @@ -287,8 +287,7 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) if ((!IsICQContact((HANDLE)lParam)) && lParam) return 0; - OPTIONSDIALOGPAGE odp = {0}; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.flags = ODPF_TCHAR | ODPF_DONTTRANSLATE; odp.hInstance = hInst; odp.dwInitParam = LPARAM(this); @@ -298,8 +297,7 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_ICQ); UserInfo_AddPage(wParam, &odp); - if (!lParam) - { + if (!lParam) { TCHAR buf[200]; mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s Details"), m_tszUserName); odp.ptszTitle = buf; diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index 8aa34ba65d..d7b3153502 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -569,8 +569,7 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = {0}; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.position = -800000000; odp.hInstance = hInst; odp.ptszGroup = LPGENT("Network"); 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; diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index 163f0f90bc..2744a00c1b 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -216,8 +216,7 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, L int CMraProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = {0}; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.dwInitParam = (LPARAM)this; odp.hInstance = masMraSettings.hInstance; odp.ptszTitle = m_tszUserName; diff --git a/protocols/MSN/msn_10.vcxproj b/protocols/MSN/msn_10.vcxproj index 2f1775f088..81e3580c47 100644 --- a/protocols/MSN/msn_10.vcxproj +++ b/protocols/MSN/msn_10.vcxproj @@ -239,7 +239,6 @@ - diff --git a/protocols/MSN/msn_10.vcxproj.filters b/protocols/MSN/msn_10.vcxproj.filters index ea6d433142..b9585f0393 100644 --- a/protocols/MSN/msn_10.vcxproj.filters +++ b/protocols/MSN/msn_10.vcxproj.filters @@ -110,9 +110,6 @@ Source Files - - Source Files - Source Files diff --git a/protocols/MSN/msn_11.vcxproj b/protocols/MSN/msn_11.vcxproj index 7d38255630..e2574dfdc2 100644 --- a/protocols/MSN/msn_11.vcxproj +++ b/protocols/MSN/msn_11.vcxproj @@ -242,7 +242,6 @@ - diff --git a/protocols/MSN/msn_11.vcxproj.filters b/protocols/MSN/msn_11.vcxproj.filters index ea6d433142..b9585f0393 100644 --- a/protocols/MSN/msn_11.vcxproj.filters +++ b/protocols/MSN/msn_11.vcxproj.filters @@ -110,9 +110,6 @@ Source Files - - Source Files - Source Files diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 2351be7f5f..240768ee53 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -669,8 +669,7 @@ 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); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.position = -790000000; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN); diff --git a/protocols/MSN/src/msn_useropts.cpp b/protocols/MSN/src/msn_useropts.cpp deleted file mode 100644 index ee7856fe9b..0000000000 --- a/protocols/MSN/src/msn_useropts.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* -Plugin of Miranda IM for communicating with users of the MSN Messenger protocol. - -Copyright (c) 2012-2013 Miranda NG Team -Copyright (c) 2006-2012 Boris Krasnovskiy. -Copyright (c) 2003-2005 George Hazan. -Copyright (c) 2002-2003 Richard Hughes (original version). - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "msn_global.h" - -///////////////////////////////////////////////////////////////////////////////////////// -// MSN contact option page dialog procedure. - -/* -INT_PTR CALLBACK MsnDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_INITDIALOG: - { - TranslateDialogDefault(hwndDlg); - - const HANDLE hContact = (HANDLE)lParam; - - SetDlgItemInt(hwndDlg, IDC_MOBILE, db_get_b(hContact, m_szModuleName, "MobileAllowed", 0), 0); - SetDlgItemInt(hwndDlg, IDC_MSN_MOBILE, db_get_b(hContact, m_szModuleName, "MobileEnabled", 0), 0); - - DWORD dwFlagBits = setDword(hContact, "FlagBits", 0); - SetDlgItemTextA(hwndDlg, IDC_WEBMESSENGER, (dwFlagBits & 0x200) ? "Y" : "N"); - } - - return TRUE; - - case WM_DESTROY: - break; - } - - return FALSE; -} -*/ -///////////////////////////////////////////////////////////////////////////////////////// -// MsnOnDetailsInit - initializes user info dialog pages. - -int MsnOnDetailsInit(WPARAM wParam, LPARAM lParam) -{ -/* - if (!MSN_IsMyContact(hContact)) - return 0; - - if (getDword(hContact, "FlagBits", 0)) - { - OPTIONSDIALOGPAGE odp = {0}; - - odp.cbSize = sizeof(odp); - odp.pfnDlgProc = MsnDlgProc; - odp.position = -1900000000; - odp.pszTemplate = MAKEINTRESOURCEA(IDD_USEROPTS); - odp.ptszTitle = m_tszUserName; - odp.flags = ODPF_TCHAR | ODPF_DONTTRANSLATE; - - UserInfo_AddPage(wParam, &odp); - } -*/ - return 0; -} diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp index c6f0bef34a..fd9b9d9dd2 100644 --- a/protocols/Omegle/src/proto.cpp +++ b/protocols/Omegle/src/proto.cpp @@ -189,7 +189,7 @@ int OmegleProto::OnModulesLoaded(WPARAM wParam,LPARAM lParam) int OmegleProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) { - OPTIONSDIALOGPAGE odp = {sizeof(odp)}; + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.hInstance = g_hInstance; odp.ptszTitle = m_tszUserName; odp.dwInitParam = LPARAM(this); @@ -201,7 +201,6 @@ int OmegleProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = OmegleOptionsProc; Options_AddPage(wParam, &odp); - return 0; } diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index 4c7cb48dc9..a42e1ea31d 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -101,8 +101,7 @@ int __cdecl CSkypeProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) { char *title = ::mir_t2a(this->m_tszUserName); - OPTIONSDIALOGPAGE odp = {0}; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.hInstance = g_hInstance; odp.pszTitle = title; odp.dwInitParam = LPARAM(this); @@ -133,8 +132,7 @@ int __cdecl CSkypeProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) if ((!this->IsProtoContact((HANDLE)lParam)) && lParam) return 0; - OPTIONSDIALOGPAGE odp = {0}; - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.flags = ODPF_TCHAR | ODPF_USERINFOTAB | ODPF_DONTTRANSLATE; odp.hInstance = g_hInstance; odp.dwInitParam = LPARAM(this); @@ -142,18 +140,15 @@ int __cdecl CSkypeProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.ptszTitle = this->m_tszUserName; HANDLE hContact = (HANDLE)lParam; - if (hContact) - { + if (hContact) { char *szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if (szProto != NULL && !strcmp(szProto, m_szModuleName)) - { + if (szProto != NULL && !strcmp(szProto, m_szModuleName)) { odp.pfnDlgProc = SkypeDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_SKYPE); UserInfo_AddPage(wParam, &odp); } } - else - { + else { NeedUpdate = 0; odp.pfnDlgProc = ContactSkypeDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OWNINFO_CONTACT); @@ -175,7 +170,6 @@ int __cdecl CSkypeProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.ptszTab = LPGENT("Skype account"); UserInfo_AddPage(wParam, &odp); } - return 0; } diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 4130ce44a3..f60e2c1d82 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -319,7 +319,7 @@ int TwitterProto::OnBuildStatusMenu(WPARAM,LPARAM) int TwitterProto::OnOptionsInit(WPARAM wParam,LPARAM) { - OPTIONSDIALOGPAGE odp = {sizeof(odp)}; + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.position = 271828; odp.hInstance = g_hInstance; odp.ptszGroup = LPGENT("Network"); @@ -332,14 +332,12 @@ int TwitterProto::OnOptionsInit(WPARAM wParam,LPARAM) odp.pfnDlgProc = options_proc; Options_AddPage(wParam, &odp); - if(ServiceExists(MS_POPUP_ADDPOPUPT)) - { + if (ServiceExists(MS_POPUP_ADDPOPUPT)) { odp.ptszTab = LPGENT("Popups"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS); odp.pfnDlgProc = popup_options_proc; Options_AddPage(wParam, &odp); } - return 0; } diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index 2d1fc9ea2e..b7a6ee094d 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -1133,6 +1133,5 @@ int OptInit(WPARAM wParam,LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTFEAT4); odp.ptszTab = LPGENT("Games"); Options_AddPage(wParam, &odp); - return 0; } \ No newline at end of file diff --git a/protocols/Xfire/src/userdetails.cpp b/protocols/Xfire/src/userdetails.cpp index 0873545bd2..93a71349a4 100644 --- a/protocols/Xfire/src/userdetails.cpp +++ b/protocols/Xfire/src/userdetails.cpp @@ -429,21 +429,15 @@ static INT_PTR CALLBACK DlgProcUserDetails(HWND hwndDlg, UINT msg, WPARAM wParam int OnDetailsInit(WPARAM wParam,LPARAM lParam) { - OPTIONSDIALOGPAGE odp = {0}; - if (!IsXFireContact((HANDLE)lParam)) return 0; - odp.cbSize = sizeof(odp); - odp.hIcon = NULL; + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.hInstance = hinstance; odp.pfnDlgProc = DlgProcUserDetails; odp.position = -1900000000; odp.pszTemplate = MAKEINTRESOURCE(IDD_UD); odp.ptszTitle = TranslateT("XFire"); - odp.pszGroup = NULL; - UserInfo_AddPage(wParam, &odp); - return 0; } \ No newline at end of file diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp index 3c6462c0d4..d53e46b965 100644 --- a/protocols/Yahoo/src/options.cpp +++ b/protocols/Yahoo/src/options.cpp @@ -357,9 +357,7 @@ static INT_PTR CALLBACK DlgProcYahooOptsIgnore(HWND hwndDlg, UINT msg, WPARAM wP int __cdecl CYahooProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { 0 }; - - odp.cbSize = sizeof(odp); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.position = -790000000; odp.hInstance = hInstance; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO); @@ -380,6 +378,5 @@ int __cdecl CYahooProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO_IGNORE); odp.pfnDlgProc = DlgProcYahooOptsIgnore; Options_AddPage(wParam, &odp); - return 0; } diff --git a/protocols/Yahoo/src/user_info.cpp b/protocols/Yahoo/src/user_info.cpp index 9aba43ac7a..39d5ed9027 100644 --- a/protocols/Yahoo/src/user_info.cpp +++ b/protocols/Yahoo/src/user_info.cpp @@ -113,11 +113,7 @@ static INT_PTR CALLBACK YahooUserInfoDlgProc( HWND hwndDlg, UINT msg, WPARAM wPa int __cdecl CYahooProto::OnUserInfoInit( WPARAM wParam, LPARAM lParam ) { - //if ( !JCallService( MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)m_szModuleName )) - // return 0; - - OPTIONSDIALOGPAGE odp = {0}; - odp.cbSize = sizeof( odp ); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.hInstance = hInstance; odp.dwInitParam = (LPARAM)this; odp.flags = ODPF_TCHAR | ODPF_DONTTRANSLATE; @@ -130,7 +126,6 @@ int __cdecl CYahooProto::OnUserInfoInit( WPARAM wParam, LPARAM lParam ) odp.ptszTitle = m_tszUserName; UserInfo_AddPage(wParam, &odp); } - return 0; } -- cgit v1.2.3