diff options
| author | James Booth <boothj5@gmail.com> | 2016-04-17 23:17:43 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2016-04-17 23:17:43 +0100 |
| commit | 2daa02cb60fc27e4dddadc32e487088c38b97b02 (patch) | |
| tree | 54f6f1ff3cc2013647478e860280d635036bbc3e /src/config | |
| parent | 6cc04bc3ba85415e6ec532ddf60738961a3a9560 (diff) | |
| parent | 4cb1d73a8358f660056156b5632e8c41659eb6e0 (diff) | |
| download | profani-tty-2daa02cb60fc27e4dddadc32e487088c38b97b02.tar.gz | |
Merge remote-tracking branch 'asdil12/tray_config'
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/preferences.c | 4 | ||||
| -rw-r--r-- | src/config/preferences.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/config/preferences.c b/src/config/preferences.c index 0ad95dc4..25a6ff87 100644 --- a/src/config/preferences.c +++ b/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; diff --git a/src/config/preferences.h b/src/config/preferences.h index 287e56d3..e4968521 100644 --- 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, |