iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Kill fe_set_hilight()

Browse Source 
It just duplicates functionality and this fixes:

- alert_taskbar chanopt not being respected
- tab color being incorrect when highlight print events are eaten
This commit is contained in:
Patrick Griffis 2016-07-24 18:08:09 -04:00
parent ba87247781
commit 03767ee0f9
5 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/fe.h
View File

@ -69,7 +69,6 @@ int fe_input_add (int sok, int flags, void *func, void *data);
void fe_input_remove (int tag); void fe_input_remove (int tag);
void fe_idle_add (void *func, void *data); void fe_idle_add (void *func, void *data);
void fe_set_topic (struct session *sess, char *topic, char *stripped_topic); 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_set_tab_color (struct session *sess, int col);
void fe_flash_window (struct session *sess); void fe_flash_window (struct session *sess);
void fe_update_mode_buttons (struct session *sess, char mode, char sign); void fe_update_mode_buttons (struct session *sess, char mode, char sign);

1
src/common/inbound.c
View File

@ -319,7 +319,6 @@ is_hilight (char *from, char *text, session *sess, server *serv)
sess->nick_said = TRUE; sess->nick_said = TRUE;
lastact_update (sess); lastact_update (sess);
} }
fe_set_hilight (sess);
return 1; return 1;
} }

1
src/common/text.c
View File

@ -2048,6 +2048,7 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d,
/* ===Highlighted message=== */ /* ===Highlighted message=== */
case XP_TE_HCHANACTION: case XP_TE_HCHANACTION:
case XP_TE_HCHANMSG: 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)) if (chanopt_is_set (prefs.hex_input_beep_hilight, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
sound_beep (sess); sound_beep (sess);
if (chanopt_is_set (prefs.hex_input_flash_hilight, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) if (chanopt_is_set (prefs.hex_input_flash_hilight, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))

10
src/fe-gtk/fe-gtk.c
View File

@ -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 static void
fe_update_mode_entry (session *sess, GtkWidget *entry, char **text, char *new_text) fe_update_mode_entry (session *sess, GtkWidget *entry, char **text, char *new_text)
{ {

4
src/fe-text/fe-text.c
View File

@ -618,10 +618,6 @@ fe_cleanup (void)
{ {
} }
void void
fe_set_hilight (struct session *sess)
{
}
void
fe_set_tab_color (struct session *sess, int col) fe_set_tab_color (struct session *sess, int col)
{ {
} }