1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/Network/MacOSXProxyProvider.cpp b/Swiften/Network/MacOSXProxyProvider.cpp
index acea480..232fc60 100644
--- a/Swiften/Network/MacOSXProxyProvider.cpp
+++ b/Swiften/Network/MacOSXProxyProvider.cpp
@@ -1,100 +1,101 @@
 /*
  * Copyright (c) 2010-2011 Thilo Cestonaro
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Base/Platform.h>
 #include <Swiften/Network/MacOSXProxyProvider.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
-#include <boost/numeric/conversion/cast.hpp>
 #include <utility>
 
+#include <boost/numeric/conversion/cast.hpp>
+
 #ifndef SWIFTEN_PLATFORM_IPHONE
 #include <SystemConfiguration/SystemConfiguration.h>
 #endif
 
 #pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
 
 using namespace Swift;
 
 #ifndef SWIFTEN_PLATFORM_IPHONE
 static HostAddressPort getFromDictionary(CFDictionaryRef dict, CFStringRef enabledKey, CFStringRef hostKey, CFStringRef portKey) {
     CFNumberRef numberValue = nullptr;
     HostAddressPort ret = HostAddressPort(HostAddress(), 0);
 
     if(CFDictionaryGetValueIfPresent(dict, reinterpret_cast<const void*> (enabledKey), reinterpret_cast<const void**> (&numberValue)) == true) {
         const int i = 0;
         CFNumberRef zero = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &i);
         CFComparisonResult result = CFNumberCompare(numberValue, zero, nullptr);
         CFRelease(zero);
 
         if(result != kCFCompareEqualTo) {
             int port = 0;
             std::string host = "";
 
             try {
                 CFNumberRef numberValue = reinterpret_cast<CFNumberRef> (CFDictionaryGetValue(dict, portKey));
                 if(numberValue != nullptr) {
                     CFNumberGetValue(numberValue, kCFNumberIntType, &port);
                 }
 
                 CFStringRef stringValue = reinterpret_cast<CFStringRef> (CFDictionaryGetValue(dict, hostKey));
                 if(stringValue != nullptr) {
                     std::vector<char> buffer;
                      // length must be +1 for the ending zero; and the Docu of CFStringGetCString tells it like
                     // if the string is toby the length must be at least 5.
                     CFIndex length = CFStringGetLength(stringValue) + 1;
                     buffer.resize(boost::numeric_cast<size_t>(length));
                     if(CFStringGetCString(stringValue, &buffer[0], length, kCFStringEncodingMacRoman)) {
                         for(char& iter : buffer) {
                             host += iter;
                         }
                     }
                 }
             }
             catch(...) {
                 std::cerr << "Exception caught ... " << std::endl;
             }
 
             if(host != "" && port != 0) {
-                ret = HostAddressPort(HostAddress(host), port);
+                ret = HostAddressPort(HostAddress::fromString(host).get(), port);
             }
         }
     }
     return ret;
 }
 #endif
 namespace Swift {
 
 MacOSXProxyProvider::MacOSXProxyProvider() {
 }
 
 HostAddressPort MacOSXProxyProvider::getHTTPConnectProxy() const {
     HostAddressPort result;
 #ifndef SWIFTEN_PLATFORM_IPHONE
     CFDictionaryRef proxies = SCDynamicStoreCopyProxies(nullptr);
     if(proxies != nullptr) {
         result = getFromDictionary(proxies, kSCPropNetProxiesHTTPEnable, kSCPropNetProxiesHTTPProxy, kSCPropNetProxiesHTTPPort);
         CFRelease(proxies);
     }
 #endif
     return result;
 }
 
 HostAddressPort MacOSXProxyProvider::getSOCKS5Proxy() const {
     HostAddressPort result;
 #ifndef SWIFTEN_PLATFORM_IPHONE
     CFDictionaryRef proxies = SCDynamicStoreCopyProxies(nullptr);
     if(proxies != nullptr) {
         result = getFromDictionary(proxies, kSCPropNetProxiesSOCKSEnable, kSCPropNetProxiesSOCKSProxy, kSCPropNetProxiesSOCKSPort);
         CFRelease(proxies);