diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-11-10 20:28:16 +0100 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-11-10 20:28:16 +0100 |
| commit | 1468d35db383790965c3d6d65c16a9f932361893 (patch) | |
| tree | f28765197e829f4572abcfe92d83879f9734cda9 /src/fe-gtk/maingui.c | |
| parent | 488883266c8da1cf97c374d565a08c6c7183f07d (diff) | |
Don't minimize/close to tray via plugin-tray when HexTray is available
Diffstat (limited to 'src/fe-gtk/maingui.c')
| -rw-r--r-- | src/fe-gtk/maingui.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index a71c2cbf..96ac5452 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -504,7 +504,7 @@ mg_windowstate_cb (GtkWindow *wid, GdkEventWindowState *event, gpointer userdata if ((event->changed_mask & GDK_WINDOW_STATE_ICONIFIED) && (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) && - prefs.hex_gui_tray_minimize) + prefs.hex_gui_tray_minimize && !hextray_mode ()) { tray_toggle_visibility (TRUE); gtk_window_deiconify (wid); @@ -3074,7 +3074,7 @@ mg_tabwindow_de_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) GSList *list; session *sess; - if (prefs.hex_gui_tray_close && tray_toggle_visibility (FALSE)) + if (tray_toggle_visibility (FALSE) && prefs.hex_gui_tray_close && !hextray_mode ()) return TRUE; /* check for remaining toplevel windows */ |