devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'incertia/exit-title'

Browse Source 
Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
This commit is contained in:
James Booth
2015-01-12 01:12:42 +00:00
parent c64484c6ed 22cc641905
commit 0d0ed9b7ca
11 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/config/preferences.c
View File

@@ -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: