From eda233a99f1a74b1d43b2cc0fd41c0a874a7b3cd Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 21 Sep 2013 13:47:25 +0000 Subject: oops, revert git-svn-id: http://svn.miranda-ng.org/main/trunk@6157 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_captcha.cpp | 4 +--- protocols/JabberG/src/jabber_form.cpp | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'protocols') diff --git a/protocols/JabberG/src/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp index f485acdae7..687b8487dd 100644 --- a/protocols/JabberG/src/jabber_captcha.cpp +++ b/protocols/JabberG/src/jabber_captcha.cpp @@ -157,13 +157,11 @@ bool CJabberProto::ProcessCaptcha(HXML node, HXML parentNode, ThreadData* info) GetObject(param.bmp, sizeof(bmp), &bmp); param.w = bmp.bmWidth; param.h = bmp.bmHeight; - /*int res = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_CAPTCHAFORM), NULL, JabberCaptchaFormDlgProc, (LPARAM)¶m); + int res = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_CAPTCHAFORM), NULL, JabberCaptchaFormDlgProc, (LPARAM)¶m); if (lstrcmp(param.Result, _T("")) == 0 || !res) sendCaptchaError(info, param.from, param.to, param.challenge); else sendCaptchaResult(param.Result, info, param.from, param.challenge, param.fromjid, param.sid); - */ - FormCreateDialog(x, _T("Bots Challenge Test"), &CJabberProto::SetMucConfig, mir_tstrdup(param.from)); return true; } diff --git a/protocols/JabberG/src/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp index 8776a965e4..a1aa699924 100644 --- a/protocols/JabberG/src/jabber_form.cpp +++ b/protocols/JabberG/src/jabber_form.cpp @@ -741,8 +741,6 @@ static INT_PTR CALLBACK JabberFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, // Set instruction field if (jfi->xNode != NULL && (n = xmlGetChild(jfi->xNode , "instructions")) != NULL && xmlGetText(n) != NULL) JabberFormSetInstruction(hwndDlg, xmlGetText(n)); - else if (jfi->xNode != NULL && (n = xmlGetChild(jfi->xNode , "label")) != NULL && xmlGetText(n) != NULL) - JabberFormSetInstruction(hwndDlg, xmlGetText(n)); else { if (jfi->xNode != NULL && (n = xmlGetChild(jfi->xNode , "title")) != NULL && xmlGetText(n) != NULL) -- cgit v1.2.3