diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/chanopt.c | 11 | ||||
| -rw-r--r-- | src/common/chanopt.h | 1 | ||||
| -rw-r--r-- | src/common/text.c | 12 |
3 files changed, 6 insertions, 18 deletions
diff --git a/src/common/chanopt.c b/src/common/chanopt.c index 561f2f9c..91b5087b 100644 --- a/src/common/chanopt.c +++ b/src/common/chanopt.c @@ -165,17 +165,6 @@ chanopt_is_set (unsigned int global, guint8 per_chan_setting) return per_chan_setting; } -/* additive version */ - -gboolean -chanopt_is_set_a (unsigned int global, guint8 per_chan_setting) -{ - if (per_chan_setting == SET_DEFAULT) - return global; - - return per_chan_setting || global; -} - /* === below is LOADING/SAVING stuff only === */ typedef struct diff --git a/src/common/chanopt.h b/src/common/chanopt.h index c0990385..18b9a432 100644 --- a/src/common/chanopt.h +++ b/src/common/chanopt.h @@ -22,7 +22,6 @@ int chanopt_command (session *sess, char *tbuf, char *word[], char *word_eol[]); gboolean chanopt_is_set (unsigned int global, guint8 per_chan_setting); -gboolean chanopt_is_set_a (unsigned int global, guint8 per_chan_setting); void chanopt_save_all (void); void chanopt_save (session *sess); void chanopt_load (session *sess); diff --git a/src/common/text.c b/src/common/text.c index 04328a69..8eabfec9 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -2080,9 +2080,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d) case XP_TE_DPRIVMSG: case XP_TE_PRIVACTION: case XP_TE_DPRIVACTION: - if (chanopt_is_set_a (prefs.hex_input_beep_priv, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) + if (chanopt_is_set (prefs.hex_input_beep_priv, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) sound_beep (sess); - if (chanopt_is_set_a (prefs.hex_input_flash_priv, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) + if (chanopt_is_set (prefs.hex_input_flash_priv, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) fe_flash_window (sess); /* why is this one different? because of plugin-tray.c's hooks! ugly */ if (sess->alert_tray == SET_ON) @@ -2092,9 +2092,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d) /* ===Highlighted message=== */ case XP_TE_HCHANACTION: case XP_TE_HCHANMSG: - if (chanopt_is_set_a (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); - if (chanopt_is_set_a (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)) fe_flash_window (sess); if (sess->alert_tray == SET_ON) fe_tray_set_icon (FE_ICON_MESSAGE); @@ -2103,9 +2103,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d) /* ===Channel message=== */ case XP_TE_CHANACTION: case XP_TE_CHANMSG: - if (chanopt_is_set_a (prefs.hex_input_beep_chans, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) + if (chanopt_is_set (prefs.hex_input_beep_chans, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) sound_beep (sess); - if (chanopt_is_set_a (prefs.hex_input_flash_chans, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) + if (chanopt_is_set (prefs.hex_input_flash_chans, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) fe_flash_window (sess); if (sess->alert_tray == SET_ON) fe_tray_set_icon (FE_ICON_MESSAGE); |