Rename use_safe_file_saving various pref to use_atomic_file_saving
as it's not 'safe'. Use old pref if new one is missing for compatibility with Geany <= 0.20. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5937 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
parent
16008db9ef
commit
4a56c9d19d
@ -1,3 +1,11 @@
|
||||
2011-09-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
|
||||
|
||||
* src/keyfile.c:
|
||||
Rename use_safe_file_saving various pref to use_atomic_file_saving
|
||||
as it's not 'safe'. Use old pref if new one is missing for
|
||||
compatibility with Geany <= 0.20.
|
||||
|
||||
|
||||
2011-09-17 Frank Lanitz <frlan@frank.uvena.de>
|
||||
|
||||
* po/fa.po, THANKS, src/about.c:
|
||||
|
@ -92,8 +92,10 @@ static GPtrArray *session_files = NULL;
|
||||
static gint session_notebook_page;
|
||||
static gint hpan_position;
|
||||
static gint vpan_position;
|
||||
static const gchar atomic_file_saving_key[] = "use_atomic_file_saving";
|
||||
|
||||
static GPtrArray *keyfile_groups = NULL;
|
||||
|
||||
GPtrArray *pref_groups = NULL;
|
||||
|
||||
|
||||
@ -193,7 +195,7 @@ static void init_pref_groups(void)
|
||||
stash_group_add_boolean(group, &editor_prefs.complete_snippets_whilst_editing,
|
||||
"complete_snippets_whilst_editing", FALSE);
|
||||
stash_group_add_boolean(group, &file_prefs.use_safe_file_saving,
|
||||
"use_safe_file_saving", FALSE);
|
||||
atomic_file_saving_key, FALSE);
|
||||
stash_group_add_boolean(group, &file_prefs.gio_unsafe_save_backup,
|
||||
"gio_unsafe_save_backup", FALSE);
|
||||
stash_group_add_boolean(group, &file_prefs.use_gio_unsafe_file_saving,
|
||||
@ -664,12 +666,20 @@ void configuration_load_session_files(GKeyFile *config, gboolean read_recent_fil
|
||||
}
|
||||
|
||||
|
||||
/* note: new settings should be added in init_pref_groups() */
|
||||
static void load_dialog_prefs(GKeyFile *config)
|
||||
{
|
||||
gchar *tmp_string, *tmp_string2;
|
||||
const gchar *default_charset = NULL;
|
||||
|
||||
/* new settings should be added in init_pref_groups() */
|
||||
/* compatibility with Geany 0.20 */
|
||||
if (!g_key_file_has_key(config, PACKAGE, atomic_file_saving_key, NULL))
|
||||
{
|
||||
g_key_file_set_boolean(config, PACKAGE, atomic_file_saving_key,
|
||||
utils_get_setting_boolean(config, PACKAGE, "use_safe_file_saving", FALSE));
|
||||
}
|
||||
|
||||
/* read stash prefs */
|
||||
settings_action(config, SETTING_READ);
|
||||
|
||||
/* general */
|
||||
|
Loading…
x
Reference in New Issue
Block a user