From: Jesse Rhodes <drubo@drubo.net>
Date: Tue, 13 Mar 2018 22:55:07 +0100
Subject: Ubuntu server and channel defaults

Revised addition of irc.ubuntu.com with #ubuntu
suggestion
---
 src/common/servlist.c | 5 ++++-
 src/fe-gtk/joind.c    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/servlist.c b/src/common/servlist.c
index 449f982..7e72203 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -166,6 +166,9 @@ static const struct defaultserver def[] =
 	/* irc. points to chat. but many users and urls still reference it */
 	{0,				"irc.freenode.net"},
 
+	{"Ubuntu Servers (freenode)", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,				"chat.freenode.net"},
+
 	{"Furnet", 0, 0, 0, 0, 0, TRUE},
 	{0,			"irc.furnet.org"},
 
@@ -928,7 +931,7 @@ servlist_load_defaults (void)
 {
 	int i = 0, j = 0;
 	ircnet *net = NULL;
-	guint def_hash = g_str_hash ("freenode");
+	guint def_hash = g_str_hash ("Ubuntu Servers (freenode)");
 
 	while (1)
 	{
diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c
index f1d3da5..6172795 100644
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@@ -247,9 +247,9 @@ joind_show_dialog (server *serv)
 							G_CALLBACK (joind_ok_cb), serv);
 							
 	if (serv->network)
-		if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "freenode") == 0)
+		if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Ubuntu Servers (freenode)") == 0)
 		{
-			gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat");
+			gtk_entry_set_text (GTK_ENTRY (entry1), "#ubuntu");
 		}
 
 	gtk_widget_grab_focus (okbutton1);
