Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-13 17:17:27 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-13 17:17:27 (GMT) |
| commit | b732f7f5113e978b01d7bf7581e66ce6956ba99a (patch) | |
| tree | 5b3fb5b0b34d541477df3f4e58de59767c17f1be | |
| parent | 790134ceb34ab6047fe204517d263f343dbeb920 (diff) | |
| download | swift-contrib-b732f7f5113e978b01d7bf7581e66ce6956ba99a.zip swift-contrib-b732f7f5113e978b01d7bf7581e66ce6956ba99a.tar.bz2 | |
Fixed compilation error.
| -rw-r--r-- | Swiften/Network/UnixProxyProvider.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Swiften/Network/UnixProxyProvider.cpp b/Swiften/Network/UnixProxyProvider.cpp index 7790ad8..4ca9311 100644 --- a/Swiften/Network/UnixProxyProvider.cpp +++ b/Swiften/Network/UnixProxyProvider.cpp @@ -26,17 +26,19 @@ UnixProxyProvider::UnixProxyProvider() : } UnixProxyProvider::~UnixProxyProvider() { +#if defined(HAVE_GCONF) delete gconfProxyProvider; +#endif } HostAddressPort UnixProxyProvider::getSOCKS5Proxy() const { HostAddressPort proxy; - if (gconfProxyProvider) { - proxy = gconfProxyProvider.getSOCKS5Proxy(); - if(proxy.isValid()) { - return proxy; - } +#if defined(HAVE_GCONF) + proxy = gconfProxyProvider->getSOCKS5Proxy(); + if(proxy.isValid()) { + return proxy; } +#endif proxy = environmentProxyProvider.getSOCKS5Proxy(); if(proxy.isValid()) { return proxy; @@ -46,12 +48,12 @@ HostAddressPort UnixProxyProvider::getSOCKS5Proxy() const { HostAddressPort UnixProxyProvider::getHTTPConnectProxy() const { HostAddressPort proxy; - if (gconfProxyProvider) { - proxy = gconfProxyProvider.getHTTPConnectProxy(); - if(proxy.isValid()) { - return proxy; - } +#if defined(HAVE_GCONF) + proxy = gconfProxyProvider->getHTTPConnectProxy(); + if(proxy.isValid()) { + return proxy; } +#endif proxy = environmentProxyProvider.getHTTPConnectProxy(); if(proxy.isValid()) { return proxy; |