Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:36:05 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:58:45 (GMT) |
| commit | 261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch) | |
| tree | c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swiften/Network/GConfProxyProvider.cpp | |
| parent | 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff) | |
| download | swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2 | |
Remove std::endl from SWIFT_LOG calls
The std::endl is now added by ~Log, but only for output to stderr or a
log file. Calls to the Android logging system or manually set callbacks
will not include the newline in the logging output.
JIRA: SWIFT-430
Test-Information:
Unit tests pass on Debian 9
Checked that running Swift with logging to stderr still had a newline.
Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
Diffstat (limited to 'Swiften/Network/GConfProxyProvider.cpp')
| -rw-r--r-- | Swiften/Network/GConfProxyProvider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/GConfProxyProvider.cpp b/Swiften/Network/GConfProxyProvider.cpp index 7c31868..a2f8adc 100644 --- a/Swiften/Network/GConfProxyProvider.cpp +++ b/Swiften/Network/GConfProxyProvider.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2016-2018 Isode Limited. | 8 | * Copyright (c) 2016-2019 Isode Limited. |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| @@ -39,7 +39,7 @@ GConfProxyProvider::GConfProxyProvider() { | |||
| 39 | 39 | ||
| 40 | socksProxy = getFromGConf("/system/proxy/socks_host", "/system/proxy/socks_port"); | 40 | socksProxy = getFromGConf("/system/proxy/socks_host", "/system/proxy/socks_port"); |
| 41 | httpProxy = getFromGConf("/system/http_proxy/host", "/system/http_proxy/port"); | 41 | httpProxy = getFromGConf("/system/http_proxy/host", "/system/http_proxy/port"); |
| 42 | SWIFT_LOG(debug) << "GConf: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString() << std::endl; | 42 | SWIFT_LOG(debug) << "GConf: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString(); |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | HostAddressPort GConfProxyProvider::getHTTPConnectProxy() const { | 45 | HostAddressPort GConfProxyProvider::getHTTPConnectProxy() const { |