diff options
| author | Bilal Elmoussaoui <bil.elmoussaoui@gmail.com> | 2017-06-25 04:42:57 +0200 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2017-07-01 16:26:00 -0400 |
| commit | 2965fbcc87c895163f683651946f96b75d7211f3 (patch) | |
| tree | 72e8a559fd1c91a7feb8c232fb726f3ca078077e | |
| parent | 98ca4e98d50439810b648cfdd20a2d1f00a86123 (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
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | data/hexchat.gresource.xml | 1 | ||||
| -rw-r--r-- | src/fe-gtk/pixmaps.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/pixmaps.h | 1 | ||||
| -rw-r--r-- | src/fe-gtk/plugin-tray.c | 2 |
5 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,5 @@ /build +builddir/ doxygen*.tmp html/ *.patch diff --git a/data/hexchat.gresource.xml b/data/hexchat.gresource.xml index 5845da5e..08b7910e 100644 --- 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 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 |