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

diff --git a/.gitignore b/.gitignore
index ab8534643ffb36b1ef58386de579046bc9a8ee0c..92ab91c6d5655e12d792d6ecdbdb0e5c198313e4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /build
+builddir/
 doxygen*.tmp
 html/
 *.patch

diff --git a/data/hexchat.gresource.xml b/data/hexchat.gresource.xml
index 5845da5e2c4d6897b40f21c9f7946c2747d305ab..08b7910ea731acad373631ba27db9fea911a643f 100644 (file)
--- a/data/hexchat.gresource.xml
+++ b/data/hexchat.gresource.xml
@@ -11,6 +11,7 @@
                <file alias="ulist_founder.png" preprocess="to-pixdata">icons/ulist_founder.png</file>
                <file alias="ulist_netop.png" preprocess="to-pixdata">icons/ulist_netop.png</file>
 
+               <file alias="tray_normal.png" preprocess="to-pixdata">icons/hexchat.png</file>
                <file alias="tray_fileoffer.png" preprocess="to-pixdata">icons/tray_fileoffer.png</file>
                <file alias="tray_highlight.png" preprocess="to-pixdata">icons/tray_highlight.png</file>
                <file alias="tray_message.png" preprocess="to-pixdata">icons/tray_message.png</file>

diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index b19c207d2048f4baeffbdd5c18afd86668fadc75..6c6cfaeb4aaf13d6247e5c35c613398b8e89f489 100644 (file)
--- 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 7241fa846880e884f2f83d227becc3cb3ed4b0fa..7f3c561ec58cb12eb27021437dc9be89485e434c 100644 (file)
--- 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 ef70b03253e77edcde27512f11ee7291478352f3..48defb1ffe0e95a5cd150fbabce55e46ecd2baeb 100644 (file)
--- 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