Revert "Fix unix path as server address"fix_unix_path_as_server_address

This reverts commit 29560ef63a6f18c7d0e6a195876f233c73337f8e.

1 files changed, 16 insertions, 27 deletions

diff --git a/src/remmina_public.c b/src/remmina_public.c
index 6d5735b7c..5c5c4640d 100644
--- a/src/remmina_public.c
+++ b/src/remmina_public.c
@@ -59,27 +59,6 @@
 #include "remmina_public.h"
 #include "remmina/remmina_trace_calls.h"
 
-static void remmina_public_parse_address(const gchar* server, gint defaultport, gchar **host, gint *port) {
-	const gchar *nul_terminated_server = NULL;
-	GNetworkAddress *address;
-	GError *err = NULL;
-
-	nul_terminated_server = g_strdup (server);
-	g_debug ("(%s) - Parsing server: %s, default port: %d", __func__, server, defaultport);
-	address = (GNetworkAddress*)g_network_address_parse ((const gchar *)nul_terminated_server, defaultport, &err);
-
-	if (address == NULL) {
-		g_debug ("(%s) - Error converting server string: %s, with error: %s", __func__, nul_terminated_server, err->message);
-		*host = NULL;
-		if (err)
-			g_error_free(err);
-	} else {
-
-		*host = g_strdup(g_network_address_get_hostname (address));
-		*port = g_network_address_get_port (address);
-	}
-}
-
 GtkWidget*
 remmina_public_create_combo_entry(const gchar *text, const gchar *def, gboolean descending)
 {
@@ -442,6 +421,7 @@ void remmina_public_get_server_port(const gchar *server, gint defaultport, gchar
 {
 	TRACE_CALL(__func__);
 
+	const gchar *nul_terminated_server = NULL;
 	if (server != NULL) {
 		if(strstr(g_strdup(server), "ID:") != NULL) {
 			g_debug ("(%s) - Using remmina_public_get_server_port_old to parse the repeater ID", __func__);
@@ -449,13 +429,22 @@ void remmina_public_get_server_port(const gchar *server, gint defaultport, gchar
 			return;
 		}
 
-		if(strstr(g_strdup(server), "unix:///") != NULL) {
-			g_debug("(%s) address contain unix:// -> %s", __func__, server);
-			gchar *val = remmina_public_str_replace(server, "unix://", "");
-			remmina_public_parse_address(val, defaultport, host, port);
-			free(val);
+		GNetworkAddress *address;
+		GError *err = NULL;
+
+		nul_terminated_server = g_strdup (server);
+		g_debug ("(%s) - Parsing server: %s, default port: %d", __func__, server, defaultport);
+		address = (GNetworkAddress*)g_network_address_parse ((const gchar *)nul_terminated_server, defaultport, &err);
+
+		if (address == NULL) {
+			g_debug ("(%s) - Error converting server string: %s, with error: %s", __func__, nul_terminated_server, err->message);
+			*host = NULL;
+			if (err)
+				g_error_free(err);
 		} else {
-			remmina_public_parse_address(server, defaultport, host, port);
+
+			*host = g_strdup(g_network_address_get_hostname (address));
+			*port = g_network_address_get_port (address);
 		}
 	} else
 		*host = NULL;