mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00
Code Issues Releases Wiki Activity

some warnings fixed, TDESKTOP_DISABLE_NETWORK_PROXY macro added

Browse Source
This commit is contained in:
John Preston
2016-03-20 11:16:35 +03:00
parent 2cbda4e1e5
commit 0b2bcbc3e9
25 changed files with 143 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/app.cpp
View File

@@ -2474,9 +2474,12 @@ namespace App {
}
void setProxySettings(QNetworkAccessManager &manager) {
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
manager.setProxy(getHttpProxySettings());
#endif
}
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
QNetworkProxy getHttpProxySettings() {
const ConnectionProxy *proxy = 0;
if (Global::started()) {
@@ -2489,14 +2492,17 @@ namespace App {
}
return QNetworkProxy(QNetworkProxy::DefaultProxy);
}
#endif
void setProxySettings(QTcpSocket &socket) {
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
if (cConnectionType() == dbictTcpProxy) {
const ConnectionProxy &p(cConnectionProxy());
socket.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, p.host, p.port, p.user, p.password));
} else {
socket.setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
}
#endif
}
QImage **cornersMask() {