talons

commit 4721a112b006dab3524fad9ad1c641c1eac73024
parent 4f858094265832164bc3e44b68bad2312dfbdea8
Author: Christian Hesse <mail@eworm.de>
Date:   Fri, 28 Aug 2015 11:03:57 +0200

Auto-configuration: set port only when not default

Diffstat:
M
src/gtk/gtkutils.c
 | 
11
+++++++----

1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
@@ -1878,13 +1878,16 @@ static void auto_configure_done(const gchar *hostname, gint port, gboolean ssl, 
 			gtk_entry_set_text(data->hostname_entry, hostname);
 		if (data->set_port)
 			gtk_toggle_button_set_active(data->set_port,
-				(ssl && port == data->default_ssl_port) || (!ssl && port == data->default_port));
+				(ssl && port != data->default_ssl_port) || (!ssl && port != data->default_port));
 		if (data->port)
 			gtk_spin_button_set_value(data->port, port);
 		else if (data->hostname_entry) {
-			gchar *tmp = g_strdup_printf("%s:%d", hostname, port);
-			gtk_entry_set_text(data->hostname_entry, tmp);
-			g_free(tmp);
+			if ((ssl && port != data->default_ssl_port) || (!ssl && port != data->default_port)) {
+				gchar *tmp = g_strdup_printf("%s:%d", hostname, port);
+				gtk_entry_set_text(data->hostname_entry, tmp);
+				g_free(tmp);
+			} else
+				gtk_entry_set_text(data->hostname_entry, hostname);
 		}
 
 		if (ssl && data->ssl_checkbtn) {