mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

some namespaces reorganized, author photo display added to wide mode (where messages are centered), version 0.9.20.dev

Browse Source
This commit is contained in:
John Preston
2016-02-08 17:54:55 +03:00
parent 5320285943
commit 80ba0259dd
46 changed files with 400 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/app.cpp
View File

@@ -2612,10 +2612,10 @@ namespace App {
QNetworkProxy getHttpProxySettings() {
const ConnectionProxy *proxy = 0;
if (Sandbox::started()) {
if (Global::started()) {
proxy = (cConnectionType() == dbictHttpProxy) ? (&cConnectionProxy()) : 0;
} else {
proxy = Global::PreLaunchProxy().host.isEmpty() ? 0 : (&Global::PreLaunchProxy());
proxy = Sandbox::PreLaunchProxy().host.isEmpty() ? 0 : (&Sandbox::PreLaunchProxy());
}
if (proxy) {
return QNetworkProxy(QNetworkProxy::HttpProxy, proxy->host, proxy->port, proxy->user, proxy->password);