Merge remote-tracking branch 'asdil12/tray_config'

src/config/preferences.c

@@ -1239,6 +1239,7 @@ _get_group(preference_t pref)
         case PREF_NOTIFY_SUB:
         case PREF_NOTIFY_MENTION_CASE_SENSITIVE:
         case PREF_NOTIFY_MENTION_WHOLE_WORD:
+        case PREF_TRAY:
             return PREF_GROUP_NOTIFICATIONS;
         case PREF_CHLOG:
         case PREF_GRLOG:
@@ -1289,6 +1290,8 @@ _get_key(preference_t pref)
             return "titlebar.goodbye";
         case PREF_FLASH:
             return "flash";
+        case PREF_TRAY:
+            return "tray";
         case PREF_INTYPE:
             return "intype";
         case PREF_HISTORY:
@@ -1502,6 +1505,7 @@ _get_default_boolean(preference_t pref)
         case PREF_TLS_SHOW:
         case PREF_LASTACTIVITY:
         case PREF_NOTIFY_MENTION_WHOLE_WORD:
+        case PREF_TRAY:
             return TRUE;
         default:
             return FALSE;

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,