fix tls unsupported issue on windows

Fix private messages splitting into two windows over WeeChat's IRC relay

src/common/cfgfiles.c

@@ -429,6 +429,8 @@ const struct prefs vars[] =
 	{"gui_lang", P_OFFINT (hex_gui_lang), TYPE_INT},
 	{"gui_mode_buttons", P_OFFINT (hex_gui_mode_buttons), TYPE_BOOL},
 	{"gui_mode_buttons_inline", P_OFFINT (hex_gui_mode_buttons_inline), TYPE_BOOL},
+	{"gui_onboarding_disable", P_OFFINT (hex_gui_onboarding_disable), TYPE_BOOL},
+	{"gui_onboarding_pending", P_OFFINT (hex_gui_onboarding_pending), TYPE_BOOL},
 	{"gui_pane_divider_position", P_OFFINT (hex_gui_pane_divider_position), TYPE_INT},
 	{"gui_pane_left_size", P_OFFINT (hex_gui_pane_left_size), TYPE_INT},
 	{"gui_pane_right_size", P_OFFINT (hex_gui_pane_right_size), TYPE_INT},

src/common/ctcp.c

@@ -126,7 +126,21 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 		if (ctcp_check (sess, nick, word, word_eol, word[4] + ctcp_offset))
 			goto generic;
 
-		inbound_action (sess, to, nick, ip, msg + 7, FALSE, tags_data->identified, tags_data);
+		{
+			gboolean private_fromme = !serv->p_cmp (nick, serv->nick) && !is_channel (serv, to);
+
+			if (private_fromme)
+			{
+				session *target = find_dialog (serv, to);
+
+				if (target)
+					sess = target;
+				else if (serv->front_session)
+					sess = serv->front_session;
+			}
+
+			inbound_action (sess, to, nick, ip, msg + 7, private_fromme, tags_data->identified, tags_data);
+		}
 		return;
 	}
 

src/common/proto-irc.c

@@ -1368,7 +1368,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 						{
 							if (ignore_check (word[1], IG_PRIV))
 								return;
-							if (serv->have_echo_message && !serv->p_cmp (nick, serv->nick))
+							if (!serv->p_cmp (nick, serv->nick))
 							{
 								session *target_sess = find_dialog (serv, to);
 

src/common/servlist.c

@@ -191,6 +191,8 @@ struct defaultserver
 	gboolean ssl;
 };
 
+static gboolean servlist_needs_onboarding_flag;
+
 static const struct defaultserver def[] =
 {
 	{"2600net",	0},
@@ -1181,7 +1183,10 @@ servlist_load (void)
 
 	fp = zoitechat_fopen_file ("servlist.conf", "r", 0);
 	if (!fp)
+	{
+		servlist_needs_onboarding_flag = TRUE;
 		return FALSE;
+	}
 
 	while (fgets (buf, sizeof (buf) - 2, fp))
 	{
@@ -1245,6 +1250,7 @@ servlist_load (void)
 			net = servlist_net_add (buf + 2, NULL, FALSE);
 	}
 	fclose (fp);
+	servlist_needs_onboarding_flag = (network_list == NULL);
 
 	return TRUE;
 }
@@ -1253,8 +1259,16 @@ void
 servlist_init (void)
 {
 	if (!network_list)
-		if (!servlist_load ())
+	{
+		if (!servlist_load () || !network_list)
 			servlist_load_defaults ();
+	}
+}
+
+gboolean
+servlist_needs_onboarding (void)
+{
+	return servlist_needs_onboarding_flag;
 }
 
 /* check if a charset is known by Iconv */
@@ -1395,6 +1409,7 @@ servlist_save (void)
 	}
 
 	fclose (fp);
+	servlist_needs_onboarding_flag = FALSE;
 	return TRUE;
 }
 

src/common/servlist.h

@@ -93,6 +93,7 @@ extern GSList *network_list;
 #define IRC_DEFAULT_CHARSET		"UTF-8 (Unicode)"
 
 void servlist_init (void);
+gboolean servlist_needs_onboarding (void);
 int servlist_save (void);
 int servlist_cycle (server *serv);
 void servlist_connect (session *sess, ircnet *net, gboolean join);

src/common/zoitechat.h

@@ -134,6 +134,8 @@ struct zoitechatprefs
 	unsigned int hex_gui_join_dialog;
 	unsigned int hex_gui_mode_buttons;
 	unsigned int hex_gui_mode_buttons_inline;
+	unsigned int hex_gui_onboarding_disable;
+	unsigned int hex_gui_onboarding_pending;
 	unsigned int hex_gui_quit_dialog;
 	/* unsigned int hex_gui_single; */
 	unsigned int hex_gui_slist_fav;

src/fe-gtk/meson.build

@@ -91,6 +91,7 @@ zoitechat_gtk_ldflags = []
 if host_machine.system() == 'windows'
   zoitechat_gtk_sources += 'notifications/notification-windows.c'
   zoitechat_gtk_deps += cc.find_library('dwmapi', required: true)
+  zoitechat_gtk_deps += cc.find_library('winhttp', required: true)
   zoitechat_theme_deps += cc.find_library('dwmapi', required: true)
 
 else

src/fe-gtk/setup.c

@@ -645,6 +645,9 @@ static const char *const proxyuse[] =
 
 static const setting network_settings[] =
 {
+        {ST_HEADER,     N_("Startup"), 0, 0, 0, 0},
+        {ST_TOGGLE,     N_("Disable first-run assistant"), P_OFFINTNL(hex_gui_onboarding_disable), 0, 0, 0},
+
         {ST_HEADER,     N_("Your Address"), 0, 0, 0, 0},
         {ST_ENTRY,      N_("Bind to:"), P_OFFSETNL(hex_net_bind_host), 0, 0, sizeof prefs.hex_net_bind_host},
         {ST_LABEL,      N_("Only useful for computers with multiple addresses.")},