From 54dec7a74c313ee61437386bd667f9a7653351fd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 19 Jun 2012 14:52:53 +0000 Subject: fixes for the options page translation git-svn-id: http://svn.miranda-ng.org/main/trunk@479 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/ui.cpp | 2 +- protocols/FacebookRM/proto.cpp | 6 +-- protocols/GTalkExt/notifications.cpp | 6 +-- protocols/GTalkExt/options.cpp | 6 +-- protocols/GTalkExt/options.h | 6 +-- protocols/Gadu-Gadu/dialogs.c | 1 - protocols/IcqOscarJ/icq_opts.cpp | 12 ++---- protocols/JabberG/jabber_opt.cpp | 1 - protocols/MRA/MraPopUp.cpp | 7 ++-- protocols/MRA/Mra_options.cpp | 63 ++++++++++++++++---------------- protocols/MSN/msn_opts.cpp | 6 +-- protocols/NewsAggregator/Src/Options.cpp | 20 +++++----- protocols/Omegle/proto.cpp | 2 +- protocols/Quotes/Forex.cpp | 13 ++----- protocols/Quotes/QuoteInfoDlg.cpp | 4 +- protocols/Twitter/proto.cpp | 8 ++-- protocols/Weather/weather_opt.cpp | 6 +-- protocols/Yahoo/options.cpp | 2 +- 18 files changed, 77 insertions(+), 94 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/ui.cpp b/protocols/AimOscar/ui.cpp index 4aa7502f73..87bedbbff8 100644 --- a/protocols/AimOscar/ui.cpp +++ b/protocols/AimOscar/ui.cpp @@ -1165,7 +1165,7 @@ int CAimProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_PRIVACY); odp.pfnDlgProc = privacy_dialog; odp.nIDBottomSimpleControl = 0; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); return 0; } diff --git a/protocols/FacebookRM/proto.cpp b/protocols/FacebookRM/proto.cpp index b0887d3f66..884fa84149 100644 --- a/protocols/FacebookRM/proto.cpp +++ b/protocols/FacebookRM/proto.cpp @@ -424,13 +424,13 @@ int FacebookProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = FBOptionsProc; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); odp.position = 271829; odp.ptszTab = LPGENT("Advanced"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_ADVANCED); odp.pfnDlgProc = FBOptionsAdvancedProc; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); odp.position = 271830; if (ServiceExists(MS_POPUP_ADDPOPUPT)) @@ -438,7 +438,7 @@ int FacebookProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Events"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_EVENTS); odp.pfnDlgProc = FBEventsProc; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); return 0; } diff --git a/protocols/GTalkExt/notifications.cpp b/protocols/GTalkExt/notifications.cpp index 59bb956308..8a8d8a618e 100644 --- a/protocols/GTalkExt/notifications.cpp +++ b/protocols/GTalkExt/notifications.cpp @@ -241,7 +241,7 @@ HANDLE SetupPseudocontact(LPCTSTR jid, LPCTSTR unreadCount, LPCSTR acc, LPCTSTR if (allocateName) free((PVOID)displayName); } - DBWriteContactSettingTString(result, CLIST_MODULE_NAME, STATUS_MSG_SETTING, TranslateT(MAIL_NOTIFICATIONS)); + DBWriteContactSettingTString(result, CLIST_MODULE_NAME, STATUS_MSG_SETTING, TranslateTS(MAIL_NOTIFICATIONS)); DBWriteContactSettingTString(result, SHORT_PLUGIN_NAME, UNREAD_THREADS_SETTING, unreadCount); return result; @@ -352,9 +352,9 @@ void UnreadThreadNotification(LPCSTR acc, LPCTSTR jid, LPCTSTR url, LPCTSTR unre } if (ReadCheckbox(0, IDC_ADDSNIP, (DWORD)TlsGetValue(itlsSettings))) - wsprintf(&data.lptzText[0], TranslateT(FULL_NOTIFICATION_FORMAT), mtn->subj, senders, mtn->snip); + wsprintf(&data.lptzText[0], TranslateTS(FULL_NOTIFICATION_FORMAT), mtn->subj, senders, mtn->snip); else - wsprintf(&data.lptzText[0], TranslateT(SHORT_NOTIFICATION_FORMAT), mtn->subj, senders); + wsprintf(&data.lptzText[0], TranslateTS(SHORT_NOTIFICATION_FORMAT), mtn->subj, senders); } __finally { free(senders); diff --git a/protocols/GTalkExt/options.cpp b/protocols/GTalkExt/options.cpp index 4232054a2c..e64e23679c 100644 --- a/protocols/GTalkExt/options.cpp +++ b/protocols/GTalkExt/options.cpp @@ -158,7 +158,7 @@ void ShowTestPopup(HWND wnd) { POPUPDATAT data = {0}; wsprintf(&data.lptzContactName[0], TEST_LETTER_INBOX); - wsprintf(&data.lptzText[0], TranslateT(FULL_NOTIFICATION_FORMAT), + wsprintf(&data.lptzText[0], TranslateTS(FULL_NOTIFICATION_FORMAT), TEST_LETTER_SUBJECT, TEST_LETTER_SENDER, TEST_LETTER_SNIP); int len = SendMessage(GetDlgItem(wnd, IDC_TIMEOUTEDIT), WM_GETTEXTLENGTH, 0, 0) + 1; @@ -245,7 +245,7 @@ void AddPopupsPage(WPARAM wParam) { OPTIONSDIALOGPAGE odp = {0}; odp.cbSize = sizeof(odp); - odp.ptszTitle = _T(MAIL_NOTIFICATIONS); + odp.ptszTitle = MAIL_NOTIFICATIONS; odp.pfnDlgProc = PopupsOptionsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPSETTINGS); odp.hInstance = hInst; @@ -265,7 +265,7 @@ void AddAccPage(LPCTSTR acc, LPCSTR mod, WPARAM wParam) odp.hInstance = hInst; odp.ptszGroup = NETWORK_OPTIONS_GROUP; odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB; - odp.ptszTab =_T(MAIL_NOTIFICATIONS); + odp.ptszTab = MAIL_NOTIFICATIONS; odp.dwInitParam = (LPARAM)mod; Options_AddPage(wParam, &odp); diff --git a/protocols/GTalkExt/options.h b/protocols/GTalkExt/options.h index d213bcbb47..bc720e22ed 100644 --- a/protocols/GTalkExt/options.h +++ b/protocols/GTalkExt/options.h @@ -23,9 +23,9 @@ #include "resources.h" -static const LPTSTR _T(MAIL_NOTIFICATIONS) = _T("GMail notifications"); -static const LPTSTR _T(FULL_NOTIFICATION_FORMAT) = _T("subject\n %s\nfrom\n%s\n%s\n"); -static const LPTSTR _T(SHORT_NOTIFICATION_FORMAT) = _T("subject\n %s\nfrom\n%s"); +static const LPTSTR MAIL_NOTIFICATIONS = _T("GMail notifications"); +static const LPTSTR FULL_NOTIFICATION_FORMAT = _T("subject\n %s\nfrom\n%s\n%s\n"); +static const LPTSTR SHORT_NOTIFICATION_FORMAT = _T("subject\n %s\nfrom\n%s"); static const LPSTR PSEUDOCONTACT_LINK = "GTalkExtNotifyContact"; static const LPSTR PSEUDOCONTACT_FLAG = "IsNotifyContact"; diff --git a/protocols/Gadu-Gadu/dialogs.c b/protocols/Gadu-Gadu/dialogs.c index ed068a1d16..5582d15ffb 100644 --- a/protocols/Gadu-Gadu/dialogs.c +++ b/protocols/Gadu-Gadu/dialogs.c @@ -126,7 +126,6 @@ static void SetValue(HWND hwndDlg, int idCtrl, HANDLE hContact, char *szModule, int gg_options_init(GGPROTO *gg, WPARAM wParam, LPARAM lParam) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.cbSize = sizeof(odp); odp.position = 1003000; odp.hInstance = hInstance; diff --git a/protocols/IcqOscarJ/icq_opts.cpp b/protocols/IcqOscarJ/icq_opts.cpp index 67c71d014e..da34fe2cdb 100644 --- a/protocols/IcqOscarJ/icq_opts.cpp +++ b/protocols/IcqOscarJ/icq_opts.cpp @@ -576,16 +576,13 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = {0}; - HMODULE hUxTheme = 0; - - if (IsWinVerXPPlus()) - { - hUxTheme = GetModuleHandleA("uxtheme.dll"); + if (IsWinVerXPPlus()) { + HMODULE hUxTheme = GetModuleHandleA("uxtheme.dll"); if (hUxTheme) pfnEnableThemeDialogTexture = (BOOL (WINAPI *)(HANDLE, DWORD))GetProcAddress(hUxTheme, "EnableThemeDialogTexture"); } + OPTIONSDIALOGPAGE odp = {0}; odp.cbSize = sizeof(odp); odp.position = -800000000; odp.hInstance = hInst; @@ -614,8 +611,7 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcIcqPrivacyOpts; Options_AddPage(wParam, &odp); - if (bPopUpService) - { + if (bPopUpService) { odp.position = 100000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); odp.groupPosition = 900000000; diff --git a/protocols/JabberG/jabber_opt.cpp b/protocols/JabberG/jabber_opt.cpp index 63c38d6d0c..f4e070271a 100644 --- a/protocols/JabberG/jabber_opt.cpp +++ b/protocols/JabberG/jabber_opt.cpp @@ -1605,7 +1605,6 @@ 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"); diff --git a/protocols/MRA/MraPopUp.cpp b/protocols/MRA/MraPopUp.cpp index 67cf3ad263..ec3893aea5 100644 --- a/protocols/MRA/MraPopUp.cpp +++ b/protocols/MRA/MraPopUp.cpp @@ -27,15 +27,14 @@ int MraPopupOptInit(WPARAM wParam,LPARAM lParam) { if (ServiceExists(MS_POPUP_ADDPOPUP)) { OPTIONSDIALOGPAGE odp = {0}; - odp.cbSize = sizeof(odp); odp.position = 100000000; odp.hInstance = masMraSettings.hInstance; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); - odp.ptszTitle = PROTOCOL_NAMEW; - odp.ptszGroup = TranslateW(L"Popups"); + odp.pszTitle = PROTOCOL_NAMEA; + odp.pszGroup = LPGEN("Popups"); odp.groupPosition = 900000000; - odp.flags = (ODPF_BOLDGROUPS | ODPF_UNICODE); + odp.flags = ODPF_BOLDGROUPS; odp.nIDBottomSimpleControl = IDC_GROUPMAIN; odp.pfnDlgProc = MraPopupDlgProcOpts; Options_AddPage(wParam, &odp); diff --git a/protocols/MRA/Mra_options.cpp b/protocols/MRA/Mra_options.cpp index 664a9ce8a6..97e1aa1b91 100644 --- a/protocols/MRA/Mra_options.cpp +++ b/protocols/MRA/Mra_options.cpp @@ -10,40 +10,39 @@ INT_PTR CALLBACK DlgProcOptsConnections (HWND hWndDlg, UINT msg, WPARAM wParam, int OptInit(WPARAM wParam,LPARAM lParam) { OPTIONSDIALOGPAGE odp={0}; - - odp.cbSize=sizeof(odp); - odp.hInstance=masMraSettings.hInstance; - odp.pszTitle=PROTOCOL_NAMEA; - odp.pszGroup="Network"; - odp.flags=ODPF_BOLDGROUPS; - - odp.pszTab="Account"; - odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_ACCOUNT); - odp.pfnDlgProc=DlgProcOptsAccount; - Options_AddPage(wParam,&odp); - - odp.pszTab="Connections"; - odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS); - odp.pfnDlgProc=DlgProcOptsConnections; - Options_AddPage(wParam,&odp); - - odp.pszTab="Anti spam"; - odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_ANTISPAM); - odp.pfnDlgProc=MraAntiSpamDlgProcOpts; - Options_AddPage(wParam,&odp); - - odp.pszTab="Files"; - odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_FILES); - odp.pfnDlgProc=MraFilesQueueDlgProcOpts; - Options_AddPage(wParam,&odp); - - odp.pszTab="Avatars"; - odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_AVATRS); - odp.pfnDlgProc=MraAvatarsQueueDlgProcOpts; - Options_AddPage(wParam,&odp); + odp.cbSize = sizeof(odp); + odp.hInstance = masMraSettings.hInstance; + odp.pszTitle = PROTOCOL_NAMEA; + odp.pszGroup = LPGEN("Network"); + odp.flags = ODPF_BOLDGROUPS; + + odp.pszTab = LPGEN("Account"); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACCOUNT); + odp.pfnDlgProc = DlgProcOptsAccount; + Options_AddPage(wParam, &odp); + + odp.pszTab = LPGEN("Connections"); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS); + odp.pfnDlgProc = DlgProcOptsConnections; + Options_AddPage(wParam, &odp); + + odp.pszTab = LPGEN("Anti spam"); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ANTISPAM); + odp.pfnDlgProc = MraAntiSpamDlgProcOpts; + Options_AddPage(wParam, &odp); + + odp.pszTab = LPGEN("Files"); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILES); + odp.pfnDlgProc = MraFilesQueueDlgProcOpts; + Options_AddPage(wParam, &odp); + + odp.pszTab = LPGEN("Avatars"); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AVATRS); + odp.pfnDlgProc = MraAvatarsQueueDlgProcOpts; + Options_AddPage(wParam, &odp); MraPopupOptInit(wParam,lParam); -return(0); + return 0; } diff --git a/protocols/MSN/msn_opts.cpp b/protocols/MSN/msn_opts.cpp index 11d077c52c..c55755f1b9 100644 --- a/protocols/MSN/msn_opts.cpp +++ b/protocols/MSN/msn_opts.cpp @@ -730,17 +730,17 @@ int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE; odp.pfnDlgProc = DlgProcMsnOpts; odp.dwInitParam = (LPARAM)this; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Connection"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN_CONN); odp.pfnDlgProc = DlgProcMsnConnOpts; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Server list"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_LISTSMGR); odp.pfnDlgProc = DlgProcMsnServLists; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Notifications"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY); diff --git a/protocols/NewsAggregator/Src/Options.cpp b/protocols/NewsAggregator/Src/Options.cpp index c9264f3d27..9484d263fc 100644 --- a/protocols/NewsAggregator/Src/Options.cpp +++ b/protocols/NewsAggregator/Src/Options.cpp @@ -634,16 +634,14 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA INT OptInit(WPARAM wParam, LPARAM lParam) { OPTIONSDIALOGPAGE odp = {0}; - - ZeroMemory(&odp, sizeof(odp)); odp.cbSize = sizeof(odp); - odp.position = 100000000; - odp.hInstance = hInst; - odp.flags = ODPF_TCHAR | ODPF_BOLDGROUPS; - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); - odp.ptszGroup = LPGENT("Network"); - odp.ptszTitle = LPGENT("News Aggregator"); - odp.pfnDlgProc = UpdateNotifyOptsProc; - Options_AddPage(wParam, &odp); - return 0; + odp.position = 100000000; + odp.hInstance = hInst; + odp.flags = ODPF_BOLDGROUPS; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); + odp.pszGroup = LPGEN("Network"); + odp.pszTitle = LPGEN("News Aggregator"); + odp.pfnDlgProc = UpdateNotifyOptsProc; + Options_AddPage(wParam, &odp); + return 0; } \ No newline at end of file diff --git a/protocols/Omegle/proto.cpp b/protocols/Omegle/proto.cpp index ca930961b8..b91cc72f23 100644 --- a/protocols/Omegle/proto.cpp +++ b/protocols/Omegle/proto.cpp @@ -219,7 +219,7 @@ int OmegleProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = OmegleOptionsProc; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); return 0; } diff --git a/protocols/Quotes/Forex.cpp b/protocols/Quotes/Forex.cpp index 62f2c6af28..bd86956a2c 100644 --- a/protocols/Quotes/Forex.cpp +++ b/protocols/Quotes/Forex.cpp @@ -375,22 +375,17 @@ namespace int QuotesEventFunc_OptInitialise(WPARAM wp,LPARAM/* lp*/) { -// USES_CONVERSION; - const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); const CQuotesProviders::TQuotesProviders& rapProviders = pProviders->GetProviders(); - OPTIONSDIALOGPAGE odp; - ZeroMemory(&odp,sizeof(odp)); - + OPTIONSDIALOGPAGE odp = { 0 }; odp.cbSize = sizeof(odp); odp.position = 910000000; odp.hInstance = CModuleInfo::GetModuleHandle(); - tstring sProtocolName = quotes_a2t(QUOTES_PROTOCOL_NAME); - odp.ptszTitle = const_cast(sProtocolName.c_str());//A2T(QUOTES_PROTOCOL_NAME); - odp.ptszGroup = _T("Network"); + odp.pszTitle = QUOTES_PROTOCOL_NAME; + odp.pszGroup = LPGEN("Network"); odp.hIcon = Quotes_LoadIconEx(ICON_STR_MAIN); - odp.flags = ODPF_TCHAR|ODPF_USERINFOTAB; + odp.flags = ODPF_USERINFOTAB; std::for_each(rapProviders.begin(),rapProviders.end(),boost::bind(&IQuotesProvider::ShowPropertyPage,_1,wp,boost::ref(odp))); return 0; diff --git a/protocols/Quotes/QuoteInfoDlg.cpp b/protocols/Quotes/QuoteInfoDlg.cpp index 0cb1c8a686..9e33a66a80 100644 --- a/protocols/Quotes/QuoteInfoDlg.cpp +++ b/protocols/Quotes/QuoteInfoDlg.cpp @@ -153,14 +153,12 @@ int QuotesEventFunc_OnUserInfoInit(WPARAM wp,LPARAM lp) OPTIONSDIALOGPAGE odp = {0}; odp.cbSize = sizeof( odp ); odp.hInstance = CModuleInfo::GetModuleHandle(); - //odp.dwInitParam = ( LPARAM )this; odp.hIcon = Quotes_LoadIconEx(ICON_STR_MAIN); - odp.flags = ODPF_TCHAR; odp.pfnDlgProc = QuoteInfoDlgProc; odp.position = -2000000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_QUOTE_INFO); - odp.ptszTitle = TranslateT("Quote"); + odp.pszTitle = LPGEN("Quote"); UserInfo_AddPage(wp, &odp); return 0; } diff --git a/protocols/Twitter/proto.cpp b/protocols/Twitter/proto.cpp index 30b3b90a16..f45e64e5d9 100644 --- a/protocols/Twitter/proto.cpp +++ b/protocols/Twitter/proto.cpp @@ -365,16 +365,16 @@ int TwitterProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; odp.ptszTab = LPGENT("Basic"); - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = options_proc; - Options_AddPage(wParam,&odp); + 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); + Options_AddPage(wParam, &odp); } return 0; diff --git a/protocols/Weather/weather_opt.cpp b/protocols/Weather/weather_opt.cpp index 6e27c45e5c..68dea66ff6 100644 --- a/protocols/Weather/weather_opt.cpp +++ b/protocols/Weather/weather_opt.cpp @@ -291,13 +291,13 @@ int OptInit(WPARAM wParam,LPARAM lParam) { odp.pszTitle = WEATHERPROTOTEXT; odp.pszTab = LPGEN("General"); odp.flags = ODPF_BOLDGROUPS; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); // text options odp.pszTemplate = MAKEINTRESOURCEA(IDD_TEXTOPT); odp.pfnDlgProc = DlgProcText; odp.pszTab = LPGEN("Display"); - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); // if popup service exists, load the weather popup options if ((ServiceExists(MS_POPUP_ADDPOPUP))) { @@ -307,7 +307,7 @@ int OptInit(WPARAM wParam,LPARAM lParam) { odp.groupPosition = 910000000; odp.pszTab = NULL; odp.pfnDlgProc = DlgPopUpOpts; - Options_AddPage(wParam,&odp); + Options_AddPage(wParam, &odp); } return 0; diff --git a/protocols/Yahoo/options.cpp b/protocols/Yahoo/options.cpp index da51259fcc..6acd8c0dca 100644 --- a/protocols/Yahoo/options.cpp +++ b/protocols/Yahoo/options.cpp @@ -376,7 +376,7 @@ INT_PTR __cdecl CYahooProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.hInstance = hInstance; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO); odp.ptszTitle = m_tszUserName; - odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR|ODPF_DONTTRANSLATE; + odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE; odp.ptszGroup = LPGENT("Network"); odp.ptszTab = LPGENT("Account"); odp.pfnDlgProc = DlgProcYahooOpts; -- cgit v1.2.3