1 files changed, 45 insertions, 27 deletions
diff --git a/Swiften/Network/GConfProxyProvider.cpp b/Swiften/Network/GConfProxyProvider.cpp
index 8d97c68..a2f8adc 100644
--- a/Swiften/Network/GConfProxyProvider.cpp
+++ b/Swiften/Network/GConfProxyProvider.cpp
@@ -4,55 +4,73 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+/*
+ * Copyright (c) 2016-2019 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swiften/Network/GConfProxyProvider.h>
+
+#include <cstdio>
+#include <cstdlib>
+
 #include <iostream>
 
+extern "C" {
 #include <gconf/gconf-client.h>
+}
+
+#include <boost/numeric/conversion/cast.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Network/GConfProxyProvider.h>
 
 namespace Swift {
 
 GConfProxyProvider::GConfProxyProvider() {
-	// Ensure static GLib initialization methods are called
-	static bool glibInitialized = false;
-	if (!glibInitialized) {
-		g_type_init();
-		glibInitialized = true;
-	}
-
-	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;
+#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();
 }
 
 HostAddressPort GConfProxyProvider::getHTTPConnectProxy() const {
-	return httpProxy;
+    return httpProxy;
 }
 
 HostAddressPort GConfProxyProvider::getSOCKS5Proxy() const {
-	return socksProxy;
+    return socksProxy;
 }
 
 HostAddressPort GConfProxyProvider::getFromGConf(const char* gcHost, const char* gcPort) {
-	std::string address;
-	int port = 0;
-	gchar* str;
+    std::string address;
+    unsigned short port = 0;
+    gchar* str;
 
-	GConfClient* client = gconf_client_get_default();
+    GConfClient* client = gconf_client_get_default();
 
-	str = gconf_client_get_string(client, gcHost, NULL);
-	port = static_cast<int> (gconf_client_get_int(client, gcPort, NULL));
+    str = gconf_client_get_string(client, gcHost, NULL);
+    try {
+        port = boost::numeric_cast<unsigned short>(gconf_client_get_int(client, gcPort, NULL));
+    }
+    catch (const boost::numeric::bad_numeric_cast&) {
+    }
 
-	if(str) {
-		address = static_cast<char*> (str);
-		g_free(str);
-	}
+    if(str) {
+        address = static_cast<char*> (str);
+        g_free(str);
+    }
 
-	g_object_unref(client);
-	return HostAddressPort(HostAddress(address), port);
+    g_object_unref(client);
+    return HostAddressPort(HostAddress::fromString(address).get_value_or(HostAddress()), port);
 }
 
 }