From 03767ee0f98262220eb13a2fcb1f2fe0963cba3d Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Sun, 24 Jul 2016 18:08:09 -0400
Subject: Kill fe_set_hilight()

It just duplicates functionality and this fixes:

- alert_taskbar chanopt not being respected
- tab color being incorrect when highlight print events are eaten
---
 src/common/fe.h       |  1 -
 src/common/inbound.c  |  1 -
 src/common/text.c     |  1 +
 src/fe-gtk/fe-gtk.c   | 10 ----------
 src/fe-text/fe-text.c |  4 ----
 5 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/common/fe.h b/src/common/fe.h
index a748668b..6614055b 100644
--- a/src/common/fe.h
+++ b/src/common/fe.h
@@ -69,7 +69,6 @@ int fe_input_add (int sok, int flags, void *func, void *data);
 void fe_input_remove (int tag);
 void fe_idle_add (void *func, void *data);
 void fe_set_topic (struct session *sess, char *topic, char *stripped_topic);
-void fe_set_hilight (struct session *sess);
 void fe_set_tab_color (struct session *sess, int col);
 void fe_flash_window (struct session *sess);
 void fe_update_mode_buttons (struct session *sess, char mode, char sign);
diff --git a/src/common/inbound.c b/src/common/inbound.c
index ffc8a3e7..50ef5032 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -319,7 +319,6 @@ is_hilight (char *from, char *text, session *sess, server *serv)
 			sess->nick_said = TRUE;
 			lastact_update (sess);
 		}
-		fe_set_hilight (sess);
 		return 1;
 	}
 
diff --git a/src/common/text.c b/src/common/text.c
index ad6f10ff..2af8ab09 100644
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -2048,6 +2048,7 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d,
 	/* ===Highlighted message=== */
 	case XP_TE_HCHANACTION:
 	case XP_TE_HCHANMSG:
+		fe_set_tab_color (sess, 3);
 		if (chanopt_is_set (prefs.hex_input_beep_hilight, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
 			sound_beep (sess);
 		if (chanopt_is_set (prefs.hex_input_flash_hilight, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 325691bf..59629047 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -557,16 +557,6 @@ fe_set_topic (session *sess, char *topic, char *stripped_topic)
 	}
 }
 
-void
-fe_set_hilight (struct session *sess)
-{
-	if (sess->gui->is_tab)
-		fe_set_tab_color (sess, 3);	/* set tab to blue */
-
-	if (prefs.hex_input_flash_hilight && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
-		fe_flash_window (sess); /* taskbar flash */
-}
-
 static void
 fe_update_mode_entry (session *sess, GtkWidget *entry, char **text, char *new_text)
 {
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c
index 7345ac6f..323cf6dc 100644
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@@ -618,10 +618,6 @@ fe_cleanup (void)
 {
 }
 void
-fe_set_hilight (struct session *sess)
-{
-}
-void
 fe_set_tab_color (struct session *sess, int col)
 {
 }
-- 
cgit 1.4.1