Renamed titlebar preference

This commit is contained in:
James Booth
2015-01-12 00:43:42 +00:00
parent e4d703f914
commit c64484c6ed
6 changed files with 51 additions and 16 deletions

View File

@@ -128,6 +128,16 @@ prefs_load(void)
g_error_free(err);
}
// move pre 0.4.6 titlebar preference
err = NULL;
gchar *old_titlebar = g_key_file_get_string(prefs, PREF_GROUP_UI, "titlebar", &err);
if (err == NULL) {
g_key_file_set_string(prefs, PREF_GROUP_UI, _get_key(PREF_TITLEBAR_SHOW), old_titlebar);
g_key_file_remove_key(prefs, PREF_GROUP_UI, "titlebar", NULL);
} else {
g_error_free(err);
}
_save_prefs();
boolean_choice_ac = autocomplete_new();
@@ -500,7 +510,7 @@ _get_group(preference_t pref)
case PREF_BEEP:
case PREF_THEME:
case PREF_VERCHECK:
case PREF_TITLEBAR:
case PREF_TITLEBAR_SHOW:
case PREF_FLASH:
case PREF_INTYPE:
case PREF_HISTORY:
@@ -571,8 +581,8 @@ _get_key(preference_t pref)
return "theme";
case PREF_VERCHECK:
return "vercheck";
case PREF_TITLEBAR:
return "titlebar";
case PREF_TITLEBAR_SHOW:
return "titlebar.show";
case PREF_FLASH:
return "flash";
case PREF_INTYPE:

View File

@@ -54,7 +54,7 @@ typedef enum {
PREF_BEEP,
PREF_VERCHECK,
PREF_THEME,
PREF_TITLEBAR,
PREF_TITLEBAR_SHOW,
PREF_FLASH,
PREF_INTYPE,
PREF_HISTORY,