diff options
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/plugin-tray.c | 18 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 3 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 5b4260fd..f7264f73 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -587,7 +587,7 @@ fe_set_hilight (struct session *sess) if (sess->gui->is_tab) fe_set_tab_color (sess, 3); /* set tab to blue */ - if (prefs.input_flash_hilight) + if (prefs.input_flash_hilight && !prefs.away_omit_alerts) fe_flash_window (sess); /* taskbar flash */ } diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 4b649d47..0897f423 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -578,7 +578,7 @@ tray_hilight_cb (char *word[], void *userdata) /*if (tray_status == TS_HIGHLIGHT) return XCHAT_EAT_NONE;*/ - if (prefs.input_tray_hilight) + if (prefs.input_tray_hilight && !prefs.away_omit_alerts) { tray_set_flash (ICON_HILIGHT); @@ -592,7 +592,7 @@ tray_hilight_cb (char *word[], void *userdata) tray_hilight_count, word[1], xchat_get_info (ph, "channel")); } - if (prefs.input_balloon_hilight) + if (prefs.input_balloon_hilight && !prefs.away_omit_alerts) tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"), word[1], xchat_get_info (ph, "channel")); @@ -605,7 +605,7 @@ tray_message_cb (char *word[], void *userdata) if (/*tray_status == TS_MESSAGE ||*/ tray_status == TS_HIGHLIGHT) return XCHAT_EAT_NONE; - if (prefs.input_tray_chans) + if (prefs.input_tray_chans && !prefs.away_omit_alerts) { tray_set_flash (ICON_MSG); @@ -617,7 +617,7 @@ tray_message_cb (char *word[], void *userdata) tray_set_tipf (_(DISPLAY_NAME": %u new public messages."), tray_pub_count); } - if (prefs.input_balloon_chans) + if (prefs.input_balloon_chans && !prefs.away_omit_alerts) tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"), word[1], xchat_get_info (ph, "channel")); @@ -646,7 +646,7 @@ tray_priv (char *from, char *text) tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"), tray_priv_count, from, network); - if (prefs.input_balloon_priv) + if (prefs.input_balloon_priv && !prefs.away_omit_alerts) tray_set_balloonf (text, _(DISPLAY_NAME": Private message from: %s (%s)"), from, network); } @@ -657,7 +657,7 @@ tray_priv_cb (char *word[], void *userdata) /*if (tray_status == TS_HIGHLIGHT) return XCHAT_EAT_NONE;*/ - if (prefs.input_tray_priv) + if (prefs.input_tray_priv && !prefs.away_omit_alerts) tray_priv (word[1], word[2]); return XCHAT_EAT_NONE; @@ -669,7 +669,7 @@ tray_invited_cb (char *word[], void *userdata) /*if (tray_status == TS_HIGHLIGHT) return XCHAT_EAT_NONE;*/ - if (prefs.input_tray_priv) + if (prefs.input_tray_priv && !prefs.away_omit_alerts) tray_priv (word[2], "Invited"); return XCHAT_EAT_NONE; @@ -687,7 +687,7 @@ tray_dcc_cb (char *word[], void *userdata) if (!network) network = xchat_get_info (ph, "server"); - if (prefs.input_tray_priv) + if (prefs.input_tray_priv && !prefs.away_omit_alerts) { tray_set_flash (ICON_FILE); @@ -700,7 +700,7 @@ tray_dcc_cb (char *word[], void *userdata) tray_file_count, word[1], network); } - if (prefs.input_balloon_priv) + if (prefs.input_balloon_priv && !prefs.away_omit_alerts) tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"), word[1], network); diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index d773cbdf..60a17a0c 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -361,6 +361,7 @@ static const setting alert_settings[] = {ST_3OGGLE, N_("Make a beep sound on:"), 0, 0, (void *)beeplist, 0}, {ST_TOGGLE, N_("Enable system tray icon"), P_OFFINTNL(gui_tray), 0, 0, 0}, + {ST_TOGGLE, N_("Omit alerts when marked as being away"), P_OFFINTNL(away_omit_alerts), 0, 0, 0}, {ST_HEADER, N_("Highlighted Messages"),0,0,0}, {ST_LABEL, N_("Highlighted messages are ones where your nickname is mentioned, but also:"), 0, 0, 0, 1}, @@ -381,6 +382,8 @@ static const setting alert_settings_hextray[] = {ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0}, {ST_3OGGLE, N_("Make a beep sound on:"), 0, 0, (void *)beeplist, 0}, + {ST_TOGGLE, N_("Omit alerts when marked as being away"), P_OFFINTNL(away_omit_alerts), 0, 0, 0}, + {ST_HEADER, N_("Highlighted Messages"),0,0,0}, {ST_LABEL, N_("Highlighted messages are ones where your nickname is mentioned, but also:"), 0, 0, 0, 1}, |