Merge remote-tracking branch 'asdil12/tray_config'

2016-04-17 23:17:43 +01:00
parent 6cc04bc3ba 4cb1d73a83
commit 2daa02cb60
9 changed files with 60 additions and 5 deletions
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -52,6 +52,7 @@ typedef enum {
    PREF_TITLEBAR_SHOW,
    PREF_TITLEBAR_GOODBYE,
    PREF_FLASH,
+    PREF_TRAY,
    PREF_INTYPE,
    PREF_HISTORY,
    PREF_CARBONS,