summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorBilal Elmoussaoui <bil.elmoussaoui@gmail.com>2017-06-25 04:42:57 +0200
committerPatrick Griffis <tingping@tingping.se>2017-07-01 16:26:00 -0400
commit2965fbcc87c895163f683651946f96b75d7211f3 (patch)
tree72e8a559fd1c91a7feb8c232fb726f3ca078077e /src
parent98ca4e98d50439810b648cfdd20a2d1f00a86123 (diff)
Support changing tray icon only with tray_normal image
Previously making a hexchat icon would override all hexchat icons
not just the tray.

Fixes #2017
Closes #2018
Diffstat (limited to 'src')
-rw-r--r--src/fe-gtk/pixmaps.c2
-rw-r--r--src/fe-gtk/pixmaps.h1
-rw-r--r--src/fe-gtk/plugin-tray.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index b19c207d..6c6cfaeb 100644
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -36,6 +36,7 @@ GdkPixbuf *pix_ulist_owner;
 GdkPixbuf *pix_ulist_founder;
 GdkPixbuf *pix_ulist_netop;
 
+GdkPixbuf *pix_tray_normal;
 GdkPixbuf *pix_tray_fileoffer;
 GdkPixbuf *pix_tray_highlight;
 GdkPixbuf *pix_tray_message;
@@ -118,6 +119,7 @@ pixmaps_init (void)
 	pix_ulist_founder = load_pixmap ("ulist_founder");
 	pix_ulist_netop = load_pixmap ("ulist_netop");
 
+	pix_tray_normal = load_pixmap ("tray_normal");
 	pix_tray_fileoffer = load_pixmap ("tray_fileoffer");
 	pix_tray_highlight = load_pixmap ("tray_highlight");
 	pix_tray_message = load_pixmap ("tray_message");
diff --git a/src/fe-gtk/pixmaps.h b/src/fe-gtk/pixmaps.h
index 7241fa84..7f3c561e 100644
--- a/src/fe-gtk/pixmaps.h
+++ b/src/fe-gtk/pixmaps.h
@@ -27,6 +27,7 @@ extern GdkPixbuf *pix_ulist_owner;
 extern GdkPixbuf *pix_ulist_founder;
 extern GdkPixbuf *pix_ulist_netop;
 
+extern GdkPixbuf *pix_tray_normal;
 extern GdkPixbuf *pix_tray_fileoffer;
 extern GdkPixbuf *pix_tray_highlight;
 extern GdkPixbuf *pix_tray_message;
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index ef70b032..48defb1f 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -54,7 +54,7 @@ typedef GdkPixbuf* TrayIcon;
 #define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL)
 #define tray_icon_free(i) g_object_unref(i)
 
-#define ICON_NORMAL pix_hexchat
+#define ICON_NORMAL pix_tray_normal
 #define ICON_MSG pix_tray_message
 #define ICON_HILIGHT pix_tray_highlight
 #define ICON_FILE pix_tray_fileoffer