Fix NickServ auth to use decrypted active password

src/common/inbound.c

@@ -1815,14 +1815,14 @@ inbound_login_end (session *sess, char *text, const message_tags_data *tags_data
 			return;
 
 		/* send nickserv password */
-		if (net && net->pass && inbound_nickserv_login (serv))
+		if (net && serv->password[0] && inbound_nickserv_login (serv))
 		{
-			serv->p_ns_identify (serv, net->pass);
+			serv->p_ns_identify (serv, serv->password);
 		}
 
 		/* wait for join if command or nickserv set */
 		if (net && prefs.hex_irc_join_delay
-			&& ((net->pass && inbound_nickserv_login (serv))
+			&& ((serv->password[0] && inbound_nickserv_login (serv))
 				|| net->commandlist))
 		{
 			serv->joindelay_tag = fe_timeout_add_seconds (prefs.hex_irc_join_delay, check_autojoin_channels, serv);

src/common/outbound.c

@@ -4868,9 +4868,9 @@ command_insert_vars (session *sess, char *cmd)
 				break;
 
 			case 'p':
-				if (mynet->pass)
+				if (sess->server->password[0])
 				{
-					g_string_append (expanded, mynet->pass);
+					g_string_append (expanded, sess->server->password);
 				}
 				cmd++;
 				break;

src/fe-gtk/chanview.c

@@ -79,8 +79,6 @@ struct _chanview
 	guint theme_listener_id;
 };
 
-static void chanview_set_font_desc (chanview *cv, const PangoFontDescription *font_desc);
-
 struct _chan
 {
 	chanview *cv;	/* our owner */
@@ -171,7 +169,6 @@ chanview_apply_theme (chanview *cv)
 	w = GTK_WIDGET (tv->tree);
 	if (input_style)
 		font = input_style->font_desc;
-	chanview_set_font_desc (cv, font);
 
 	theme_manager_apply_channel_tree_style (w,
 			theme_manager_get_channel_tree_palette_behavior (font));
@@ -316,14 +313,6 @@ chanview_free_ch (chanview *cv, GtkTreeIter *iter)
 	g_free (ch);
 }
 
-static void
-chanview_set_font_desc (chanview *cv, const PangoFontDescription *font_desc)
-{
-	if (cv->font_desc)
-		pango_font_description_free (cv->font_desc);
-	cv->font_desc = font_desc ? pango_font_description_copy (font_desc) : NULL;
-}
-
 static void
 chanview_destroy_store (chanview *cv)	/* free every (chan *) in the store */
 {
@@ -346,9 +335,6 @@ chanview_destroy (chanview *cv)
 	if (cv->box)
 		gtk_widget_destroy (cv->box);
 
-	if (cv->font_desc)
-		pango_font_description_free (cv->font_desc);
-
 	chanview_destroy_store (cv);
 	g_free (cv);
 }
@@ -370,7 +356,7 @@ chanview_new (int type, int trunc_len, gboolean sort, gboolean use_icons,
 	cv = g_new0 (chanview, 1);
 	cv->store = gtk_tree_store_new (5, G_TYPE_STRING, G_TYPE_POINTER,
 							  PANGO_TYPE_ATTR_LIST, GDK_TYPE_PIXBUF, G_TYPE_INT);
-	cv->font_desc = font_desc ? pango_font_description_copy (font_desc) : NULL;
+	cv->font_desc = font_desc;
 	cv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	cv->trunc_len = trunc_len;
 	cv->sorted = sort;

src/fe-gtk/fe-gtk.c

@@ -1357,19 +1357,17 @@ fe_open_url_inner (const char *url)
 	gboolean opened = FALSE;
 
 #ifdef WIN32
-	gunichar2 *url_utf16 = g_utf8_to_utf16 (escaped_url, -1, NULL, NULL, NULL);
+	opened = g_app_info_launch_default_for_uri (escaped_url, NULL, &error);
-
-	if (url_utf16 != NULL)
-	{
-		opened = ((INT_PTR) ShellExecuteW (0, L"open", url_utf16, NULL, NULL, SW_SHOWNORMAL)) > 32;
-		g_free (url_utf16);
-	}
-
 	if (!opened)
 	{
-		opened = g_app_info_launch_default_for_uri (escaped_url, NULL, &error);
+		g_clear_error (&error);
-		if (!opened)
+		gunichar2 *url_utf16 = g_utf8_to_utf16 (escaped_url, -1, NULL, NULL, NULL);
-			g_clear_error (&error);
+
+		if (url_utf16 != NULL)
+		{
+			opened = ((INT_PTR) ShellExecuteW (0, L"open", url_utf16, NULL, NULL, SW_SHOWNORMAL)) > 32;
+			g_free (url_utf16);
+		}
 	}
 #else
 	{