summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2012-12-20 19:53:58 -0500
committerTingPing <tingping@tingping.se>2012-12-20 19:53:58 -0500
commitb259595c9d5d27686e26f8aac2a74f4ef189555a (patch)
tree81c74a9af59765fe7daf762eb91f13c65355546e /src
parent4524367cc037f6b3e173de96ea9b57afc2a0da5a (diff)
allow tray blinks to be static icons
Diffstat (limited to 'src')
-rw-r--r--src/common/cfgfiles.c2
-rw-r--r--src/common/hexchat.h1
-rw-r--r--src/fe-gtk/plugin-tray.c3
3 files changed, 5 insertions, 1 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index c1e742c5..31336c20 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -461,6 +461,7 @@ const struct prefs vars[] =
 	{"gui_topicbar", P_OFFINT (hex_gui_topicbar), TYPE_BOOL},
 	{"gui_tray", P_OFFINT (hex_gui_tray), TYPE_BOOL},
 	{"gui_tray_away", P_OFFINT (hex_gui_tray_away), TYPE_BOOL},
+	{"gui_tray_blink", P_OFFINT (hex_gui_tray_blink), TYPE_BOOL},
 	{"gui_tray_close", P_OFFINT (hex_gui_tray_close), TYPE_BOOL},
 	{"gui_tray_minimize", P_OFFINT (hex_gui_tray_minimize), TYPE_BOOL},
 	{"gui_tray_quiet", P_OFFINT (hex_gui_tray_quiet), TYPE_BOOL},
@@ -669,6 +670,7 @@ load_config (void)
 	prefs.hex_gui_tab_sort = 1;
 	prefs.hex_gui_topicbar = 1;
 	prefs.hex_gui_tray = 1;
+	prefs.hex_gui_tray_blink = 1;
 	prefs.hex_gui_ulist_count = 1;
 	prefs.hex_gui_ulist_icons = 1;
 	prefs.hex_gui_ulist_resizable = 1;
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index 5d5cda69..c80156bd 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -153,6 +153,7 @@ struct hexchatprefs
 	unsigned int hex_gui_topicbar;
 	unsigned int hex_gui_tray;
 	unsigned int hex_gui_tray_away;
+	unsigned int hex_gui_tray_blink;
 	unsigned int hex_gui_tray_close;
 	unsigned int hex_gui_tray_minimize;
 	unsigned int hex_gui_tray_quiet;
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index 1db0f630..9f0eff32 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -301,7 +301,8 @@ tray_set_flash (TrayIcon icon)
 	tray_stop_flash ();
 
 	gtk_status_icon_set_from_pixbuf (sticon, icon);
-	flash_tag = g_timeout_add (TIMEOUT, (GSourceFunc) tray_timeout_cb, icon);
+	if (prefs.hex_gui_tray_blink)
+		flash_tag = g_timeout_add (TIMEOUT, (GSourceFunc) tray_timeout_cb, icon);
 }
 
 void