moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

fe-gtk: Fixed notification balloons for PMs not getting displayed if blinking tray icons for PMs is unchecked.

This commit is contained in:
Arnavion 2013-12-27 19:41:18 -08:00
parent c7bf4b0474
commit c531db4714
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/fe-gtk/plugin-tray.c
View File

@ -758,19 +758,22 @@ tray_priv (char *from, char *text)
if (alert_match_word (from, prefs.hex_irc_no_hilight)) if (alert_match_word (from, prefs.hex_irc_no_hilight))
return; return;
tray_set_flash (ICON_MSG);
network = hexchat_get_info (ph, "network"); network = hexchat_get_info (ph, "network");
if (!network) if (!network)
network = hexchat_get_info (ph, "server"); network = hexchat_get_info (ph, "server");
tray_priv_count++; if (prefs.hex_input_tray_priv)
if (tray_priv_count == 1) {
tray_set_tipf (_(DISPLAY_NAME": Private message from: %s (%s)"), tray_set_flash(ICON_MSG);
from, network);
else tray_priv_count++;
tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"), if (tray_priv_count == 1)
tray_priv_count, from, network); tray_set_tipf(_(DISPLAY_NAME": Private message from: %s (%s)"),
from, network);
else
tray_set_tipf(_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"),
tray_priv_count, from, network);
}
if (prefs.hex_input_balloon_priv) if (prefs.hex_input_balloon_priv)
tray_set_balloonf (text, _("Private message from: %s (%s)"), tray_set_balloonf (text, _("Private message from: %s (%s)"),
@ -780,11 +783,7 @@ tray_priv (char *from, char *text)
static int static int
tray_priv_cb (char *word[], void *userdata) tray_priv_cb (char *word[], void *userdata)
{ {
/*if (tray_status == TS_HIGHLIGHT) tray_priv (word[1], word[2]);
return HEXCHAT_EAT_NONE;*/
if (prefs.hex_input_tray_priv)
tray_priv (word[1], word[2]);
return HEXCHAT_EAT_NONE; return HEXCHAT_EAT_NONE;
} }
@ -792,10 +791,7 @@ tray_priv_cb (char *word[], void *userdata)
static int static int
tray_invited_cb (char *word[], void *userdata) tray_invited_cb (char *word[], void *userdata)
{ {
/*if (tray_status == TS_HIGHLIGHT) if (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)
return HEXCHAT_EAT_NONE;*/
if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_priv (word[2], "Invited"); tray_priv (word[2], "Invited");
return HEXCHAT_EAT_NONE; return HEXCHAT_EAT_NONE;