diff options
| author | James Booth <boothj5@gmail.com> | 2015-01-12 01:12:42 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-01-12 01:12:42 +0000 |
| commit | 0d0ed9b7ca4b9055fece7ddc4e2430b900cbb355 (patch) | |
| tree | e25b30c13981503ac96b85f6514a40eab98279b1 /src/config | |
| parent | c64484c6ed8ab38b840786d76e986cf622d56ece (diff) | |
| parent | 22cc641905fcb6f321653a2826ef588d4cece223 (diff) | |
| download | profani-tty-0d0ed9b7ca4b9055fece7ddc4e2430b900cbb355.tar.gz | |
Merge remote-tracking branch 'incertia/exit-title'
Conflicts: src/command/command.c src/config/preferences.c src/config/preferences.h
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/preferences.c | 3 | ||||
| -rw-r--r-- | src/config/preferences.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/config/preferences.c b/src/config/preferences.c index 30456f99..6e7ab576 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -511,6 +511,7 @@ _get_group(preference_t pref) case PREF_THEME: case PREF_VERCHECK: case PREF_TITLEBAR_SHOW: + case PREF_TITLEBAR_GOODBYE: case PREF_FLASH: case PREF_INTYPE: case PREF_HISTORY: @@ -583,6 +584,8 @@ _get_key(preference_t pref) return "vercheck"; case PREF_TITLEBAR_SHOW: return "titlebar.show"; + case PREF_TITLEBAR_GOODBYE: + return "titlebar.goodbye"; case PREF_FLASH: return "flash"; case PREF_INTYPE: diff --git a/src/config/preferences.h b/src/config/preferences.h index a7ce4d8d..a0ad2f84 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -55,6 +55,7 @@ typedef enum { PREF_VERCHECK, PREF_THEME, PREF_TITLEBAR_SHOW, + PREF_TITLEBAR_GOODBYE, PREF_FLASH, PREF_INTYPE, PREF_HISTORY, |