diff options
| author | Patrick Griffis <tingping@tingping.se> | 2017-08-31 09:52:45 -0400 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2017-08-31 10:16:03 -0400 |
| commit | d99cd18fb9e97c4ec264ad7a72bf7e2ba9a6dfa2 (patch) | |
| tree | d2cb813ed55b738e354c1554052ac6556b4de2b2 /src/fe-gtk/plugin-tray.c | |
| parent | 281038e725e05e8373e11f8edcbcbfc746e1427d (diff) | |
Improve detection of system tray support
Closes #2045
Diffstat (limited to 'src/fe-gtk/plugin-tray.c')
| -rw-r--r-- | src/fe-gtk/plugin-tray.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 48defb1f..b5f1624a 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -29,6 +29,7 @@ #include "pixmaps.h" #include "maingui.h" #include "menu.h" +#include "gtkutil.h" #ifndef WIN32 #include <unistd.h> @@ -759,7 +760,8 @@ tray_apply_setup (void) } else { - if (prefs.hex_gui_tray && !unity_mode ()) + GtkWindow *window = GTK_WINDOW(hexchat_get_info (ph, "gtkwin_ptr")); + if (prefs.hex_gui_tray && gtkutil_tray_icon_supported (window)) tray_init (); } } @@ -793,7 +795,8 @@ tray_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, hexchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL); - if (prefs.hex_gui_tray && !unity_mode ()) + GtkWindow *window = GTK_WINDOW(hexchat_get_info (ph, "gtkwin_ptr")); + if (prefs.hex_gui_tray && gtkutil_tray_icon_supported (window)) tray_init (); return 1; /* return 1 for success */ |