summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_form.cpp
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2015-02-28 11:47:11 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2015-02-28 11:47:11 +0000
commita1009bf5a26ec6e13badf360278765ea8c0f0edd (patch)
tree3deac61399b3d6cf9a5237622833fe9098550191 /protocols/JabberG/src/jabber_form.cpp
parente44d626b32c534cace3a54d54778dfa9cf3599c9 (diff)
Jabber:
-minor fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@12286 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_form.cpp')
-rw-r--r--protocols/JabberG/src/jabber_form.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp
index 20ce305381..d9680fe64a 100644
--- a/protocols/JabberG/src/jabber_form.cpp
+++ b/protocols/JabberG/src/jabber_form.cpp
@@ -736,7 +736,7 @@ static INT_PTR CALLBACK JabberFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
else {
if (jfi->xNode != NULL && (n = xmlGetChild(jfi->xNode, _T("title"))) != NULL && xmlGetText(n) != NULL)
JabberFormSetInstruction(hwndDlg, xmlGetText(n));
- else if (jfi->defTitle != NULL)
+ else
JabberFormSetInstruction(hwndDlg, TranslateTS(jfi->defTitle));
}
@@ -781,7 +781,7 @@ static INT_PTR CALLBACK JabberFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
case WM_MOUSEWHEEL:
{
- int zDelta = GET_WHEEL_DELTA_WPARAM(wParam);
+ short zDelta = GET_WHEEL_DELTA_WPARAM(wParam);
if (zDelta) {
int nScrollLines=0;
SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, (void*)&nScrollLines, 0);