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

Rename /titlebar -> /wintitle

Browse Source
This commit is contained in:
James Booth
2016-09-22 21:42:00 +01:00
parent f683a704ad
commit 3983ee1d6b
11 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/config/preferences.c
View File

@@ -143,6 +143,19 @@ prefs_load(void)
prefs_free_string(value);
}
// move pre 0.5.0 titlebar settings to wintitle
if (g_key_file_has_key(prefs, PREF_GROUP_UI, "titlebar.show", NULL)) {
gboolean show = g_key_file_get_boolean(prefs, PREF_GROUP_UI, "titlebar.show", NULL);
g_key_file_set_boolean(prefs, PREF_GROUP_UI, "wintitle.show", show);
g_key_file_remove_key(prefs, PREF_GROUP_UI, "titlebar.show", NULL);
}
if (g_key_file_has_key(prefs, PREF_GROUP_UI, "titlebar.goodbye", NULL)) {
gboolean goodbye = g_key_file_get_boolean(prefs, PREF_GROUP_UI, "titlebar.goodbye", NULL);
g_key_file_set_boolean(prefs, PREF_GROUP_UI, "wintitle.goodbye", goodbye);
g_key_file_remove_key(prefs, PREF_GROUP_UI, "titlebar.goodbye", NULL);
}
_save_prefs();
boolean_choice_ac = autocomplete_new();
@@ -1162,8 +1175,8 @@ _get_group(preference_t pref)
case PREF_BEEP:
case PREF_THEME:
case PREF_VERCHECK:
case PREF_TITLEBAR_SHOW:
case PREF_TITLEBAR_GOODBYE:
case PREF_WINTITLE_SHOW:
case PREF_WINTITLE_GOODBYE:
case PREF_FLASH:
case PREF_INTYPE:
case PREF_HISTORY:
@@ -1282,10 +1295,10 @@ _get_key(preference_t pref)
return "theme";
case PREF_VERCHECK:
return "vercheck";
case PREF_TITLEBAR_SHOW:
return "titlebar.show";
case PREF_TITLEBAR_GOODBYE:
return "titlebar.goodbye";
case PREF_WINTITLE_SHOW:
return "wintitle.show";
case PREF_WINTITLE_GOODBYE:
return "wintitle.goodbye";
case PREF_FLASH:
return "flash";
case PREF_TRAY:

4
src/config/preferences.h
View File

@@ -49,8 +49,8 @@ typedef enum {
PREF_BEEP,
PREF_VERCHECK,
PREF_THEME,
PREF_TITLEBAR_SHOW,
PREF_TITLEBAR_GOODBYE,
PREF_WINTITLE_SHOW,
PREF_WINTITLE_GOODBYE,
PREF_FLASH,
PREF_TRAY,
PREF_TRAY_READ,