Mirrors/hexchat
1
0
Fork 0
mirror of https://github.com/hexchat/hexchat.git synced 2024-11-09 12:42:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support changing tray icon only with tray_normal image

Browse Source 
Previously making a hexchat icon would override all hexchat icons
not just the tray.

Fixes #2017
Closes #2018
This commit is contained in:
Bilal Elmoussaoui 2017-06-25 04:42:57 +02:00 committed by Patrick Griffis
parent 98ca4e98d5
commit 2965fbcc87
5 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
/build /build
builddir/
doxygen*.tmp doxygen*.tmp
html/ html/
*.patch *.patch

1
data/hexchat.gresource.xml
View File

@ -11,6 +11,7 @@
<file alias="ulist_founder.png" preprocess="to-pixdata">icons/ulist_founder.png</file> <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="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_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_highlight.png" preprocess="to-pixdata">icons/tray_highlight.png</file>
<file alias="tray_message.png" preprocess="to-pixdata">icons/tray_message.png</file> <file alias="tray_message.png" preprocess="to-pixdata">icons/tray_message.png</file>

2
src/fe-gtk/pixmaps.c
View File

@ -36,6 +36,7 @@ GdkPixbuf *pix_ulist_owner;
GdkPixbuf *pix_ulist_founder; GdkPixbuf *pix_ulist_founder;
GdkPixbuf *pix_ulist_netop; GdkPixbuf *pix_ulist_netop;
GdkPixbuf *pix_tray_normal;
GdkPixbuf *pix_tray_fileoffer; GdkPixbuf *pix_tray_fileoffer;
GdkPixbuf *pix_tray_highlight; GdkPixbuf *pix_tray_highlight;
GdkPixbuf *pix_tray_message; GdkPixbuf *pix_tray_message;
@ -118,6 +119,7 @@ pixmaps_init (void)
pix_ulist_founder = load_pixmap ("ulist_founder"); pix_ulist_founder = load_pixmap ("ulist_founder");
pix_ulist_netop = load_pixmap ("ulist_netop"); pix_ulist_netop = load_pixmap ("ulist_netop");
pix_tray_normal = load_pixmap ("tray_normal");
pix_tray_fileoffer = load_pixmap ("tray_fileoffer"); pix_tray_fileoffer = load_pixmap ("tray_fileoffer");
pix_tray_highlight = load_pixmap ("tray_highlight"); pix_tray_highlight = load_pixmap ("tray_highlight");
pix_tray_message = load_pixmap ("tray_message"); pix_tray_message = load_pixmap ("tray_message");

1
src/fe-gtk/pixmaps.h
View File

@ -27,6 +27,7 @@ extern GdkPixbuf *pix_ulist_owner;
extern GdkPixbuf *pix_ulist_founder; extern GdkPixbuf *pix_ulist_founder;
extern GdkPixbuf *pix_ulist_netop; extern GdkPixbuf *pix_ulist_netop;
extern GdkPixbuf *pix_tray_normal;
extern GdkPixbuf *pix_tray_fileoffer; extern GdkPixbuf *pix_tray_fileoffer;
extern GdkPixbuf *pix_tray_highlight; extern GdkPixbuf *pix_tray_highlight;
extern GdkPixbuf *pix_tray_message; extern GdkPixbuf *pix_tray_message;

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

@ -54,7 +54,7 @@ typedef GdkPixbuf* TrayIcon;
#define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL) #define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL)
#define tray_icon_free(i) g_object_unref(i) #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_MSG pix_tray_message
#define ICON_HILIGHT pix_tray_highlight #define ICON_HILIGHT pix_tray_highlight
#define ICON_FILE pix_tray_fileoffer #define ICON_FILE pix_tray_fileoffer