diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2014-11-29 15:30:09 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2014-11-29 15:30:09 +0000 |
| commit | fe076d92eca402b27979bacf4062563e759e7279 (patch) | |
| tree | acca86039c851dd4a85240c195f0e759787aecbe /protocols/JabberG/src | |
| parent | 425e0f8eb79c6779ebe40f75cce92194ed103389 (diff) | |
-Fixed a bug in Ping and other small things reported in #837
git-svn-id: http://svn.miranda-ng.org/main/trunk@11151 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_file.cpp | 3 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_groupchat.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp index f394d8ff8e..078cbcc98f 100644 --- a/protocols/JabberG/src/jabber_file.cpp +++ b/protocols/JabberG/src/jabber_file.cpp @@ -37,7 +37,6 @@ void __cdecl CJabberProto::FileReceiveThread(filetransfer *ft) NETLIBOPENCONNECTION nloc = { 0 };
nloc.cbSize = sizeof(nloc);
- nloc.cbSize = sizeof(NETLIBOPENCONNECTION);
nloc.szHost = ft->httpHostName;
nloc.wPort = ft->httpPort;
info.s = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_hNetlibUser, (LPARAM)&nloc);
@@ -73,7 +72,7 @@ void __cdecl CJabberProto::FileReceiveThread(filetransfer *ft) ft->s = NULL;
- if (ft->state == FT_DONE || (ft->state == FT_RECEIVING && ft->std.currentFileSize < 0))
+ if (ft->state == FT_DONE || (ft->state == FT_RECEIVING && ft->std.currentFileSize == 0))
ft->complete();
debugLogA("Thread ended: type=file_receive server='%s'", ft->httpHostName);
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 5c8ab6f357..330f472c40 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -519,7 +519,7 @@ INT_PTR CJabberDlgGcJoin::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) case WM_DRAWITEM:
{
LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
- if (lpdis->CtlID != IDC_ROOM || lpdis->itemID < 0)
+ if (lpdis->CtlID != IDC_ROOM)
break;
RoomInfo *info = (RoomInfo *)SendDlgItemMessage(m_hwnd, IDC_ROOM, CB_GETITEMDATA, lpdis->itemID, 0);
|