diff options
| author |  Szymon Tomasz Stefanek | 2015-09-19 23:54:55 +0200 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2015-09-19 23:54:55 +0200 |
| commit | bd9a509651b34fd52c6ef3968715b58c70f29872 (patch) | |
| tree | fd6370e446e2d18a6bf4876e595edd86acc6fb3e /src/modules/http/HttpFileTransfer.cpp | |
| parent | Merge pull request #1609 from uNiversaI/Cizzle-and-Burn (diff) | |
| download | KVIrc-bd9a509651b34fd52c6ef3968715b58c70f29872.tar.gz KVIrc-bd9a509651b34fd52c6ef3968715b58c70f29872.tar.bz2 KVIrc-bd9a509651b34fd52c6ef3968715b58c70f29872.zip | |
Add support for avatars over https. Add support for redirects in KviHttpTransfer/http.get. Fixes #1604
Diffstat (limited to 'src/modules/http/HttpFileTransfer.cpp')
| -rw-r--r-- | src/modules/http/HttpFileTransfer.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp index 08bb83ed2..0c263fca9 100644 --- a/src/modules/http/HttpFileTransfer.cpp +++ b/src/modules/http/HttpFileTransfer.cpp @@ -444,7 +444,14 @@ void HttpFileTransfer::transferTerminated(bool bSuccess) m_eGeneralStatus = Success; displayUpdate(); if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSUCCESS,__tr2qs_ctx("[HTTP %d]: Transfer completed","http"),id()); - g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString(),QString(),!m_bNotifyCompletion); + g_pApp->fileDownloadTerminated( + true, + m_pHttpRequest->url().url(), + m_pHttpRequest->fileName(), + QString(), + QString(), + !m_bNotifyCompletion + ); } else { m_szStatusString = __tr2qs_ctx("Transfer failed","http"); m_szStatusString += ": "; @@ -452,7 +459,14 @@ void HttpFileTransfer::transferTerminated(bool bSuccess) m_eGeneralStatus = Failure; displayUpdate(); if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICERROR,__tr2qs_ctx("[HTTP %d]: Transfer failed: %Q","http"),id(),&(m_pHttpRequest->lastError())); - g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString(),m_pHttpRequest->lastError(),!m_bNotifyCompletion); + g_pApp->fileDownloadTerminated( + false, + m_pHttpRequest->url().url(), + m_pHttpRequest->fileName(), + QString(), + m_pHttpRequest->lastError(), + !m_bNotifyCompletion + ); } if(m_bAutoClean) |