diff options
Diffstat (limited to 'Swiften/Network/GConfProxyProvider.cpp')
-rw-r--r-- | Swiften/Network/GConfProxyProvider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Network/GConfProxyProvider.cpp b/Swiften/Network/GConfProxyProvider.cpp index 40cd97c..eade450 100644 --- a/Swiften/Network/GConfProxyProvider.cpp +++ b/Swiften/Network/GConfProxyProvider.cpp @@ -1,50 +1,50 @@ /* * Copyright (c) 2010-2011 Thilo Cestonaro * Licensed under the simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ /* * Copyright (c) 2016-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Network/GConfProxyProvider.h> #include <cstdio> #include <cstdlib> #include <iostream> -export "C" { +extern "C" { #include <gconf/gconf-client.h> } #include <Swiften/Base/Log.h> namespace Swift { GConfProxyProvider::GConfProxyProvider() { #if !GLIB_CHECK_VERSION(2,35,0) // Ensure static GLib initialization methods are called static bool glibInitialized = false; if (!glibInitialized) { g_type_init(); glibInitialized = true; } #endif socksProxy = getFromGConf("/system/proxy/socks_host", "/system/proxy/socks_port"); httpProxy = getFromGConf("/system/http_proxy/host", "/system/http_proxy/port"); SWIFT_LOG(debug) << "GConf: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString() << std::endl; } HostAddressPort GConfProxyProvider::getHTTPConnectProxy() const { return httpProxy; } HostAddressPort GConfProxyProvider::getSOCKS5Proxy() const { return socksProxy; } |