From 769b537b5e1a99fc53aa7296fd2b21dc77a4071c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Aug 2015 20:33:13 +0000 Subject: name conflicts solved git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/src/db.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/IcqOscarJ') diff --git a/protocols/IcqOscarJ/src/db.cpp b/protocols/IcqOscarJ/src/db.cpp index cadfd7eab6..b241e970ec 100644 --- a/protocols/IcqOscarJ/src/db.cpp +++ b/protocols/IcqOscarJ/src/db.cpp @@ -162,7 +162,7 @@ static INT_PTR CALLBACK PwConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, return FALSE; } -int ChangeInfoData::SaveSettingsToDb(HWND hwndDlg) +int ChangeInfoData::SaveSettingsToDb(HWND hwnd) { int ret = 1; @@ -181,12 +181,12 @@ int ChangeInfoData::SaveSettingsToDb(HWND hwndDlg) if (si.displayType & LIF_PASSWORD) { size_t nSettingLen = mir_strlen((char*)sid.value); if (nSettingLen > 8 || nSettingLen < 1) { - MessageBox(hwndDlg, TranslateT("The ICQ server does not support passwords longer than 8 characters. Please use a shorter password."), TranslateT("Change ICQ Details"), MB_OK); + MessageBox(hwnd, TranslateT("The ICQ server does not support passwords longer than 8 characters. Please use a shorter password."), TranslateT("Change ICQ Details"), MB_OK); ret = 0; break; } PwConfirmDlgParam param = { ppro, (char*)sid.value }; - if (IDOK != DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_PWCONFIRM), hwndDlg, PwConfirmDlgProc, (LPARAM)¶m)) { + if (IDOK != DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_PWCONFIRM), hwnd, PwConfirmDlgProc, (LPARAM)¶m)) { ret = 0; break; } -- cgit v1.2.3