Branch: refs/heads/master Author: Thomas Martitz thomas.martitz@mailbox.org Committer: GitHub noreply@github.com Date: Thu, 08 Sep 2022 21:23:51 UTC Commit: 6b5e711c76c083bc2a8e56fdfb57cafb6fa632f1 https://github.com/geany/geany/commit/6b5e711c76c083bc2a8e56fdfb57cafb6fa632...

Log Message: ----------- Properly fallback to geany.conf for session data (#3264)

The fallback was not applied for loading the user session files (i.e. the opened files) but only for other session config.

Fixes #3236

Modified Paths: -------------- src/keyfile.c

Modified: src/keyfile.c 79 lines changed, 55 insertions(+), 24 deletions(-) =================================================================== @@ -121,6 +121,43 @@ typedef enum MAX_PAYLOAD } ConfigPayload;

+/* Fallback only used when loading config. Saving config should always write the real file. */ +static gchar *get_keyfile_for_payload(ConfigPayload payload) +{ + static gboolean logged; + gchar *file; + + switch (payload) + { + case PREFS: + file = g_build_filename(app->configdir, PREFS_FILE, NULL); + if (! g_file_test(file, G_FILE_TEST_IS_REGULAR)) + { /* config file does not (yet) exist, so try to load a global config + * file which may be created by distributors */ + g_message("No user config file found, trying to use global configuration."); + g_free(file); + file = g_build_filename(app->datadir, PREFS_FILE, NULL); + } + return file; + case SESSION: + file = g_build_filename(app->configdir, SESSION_FILE, NULL); + if (! g_file_test(file, G_FILE_TEST_IS_REGULAR)) + { + if (!logged) + { + g_message("No user session file found, trying to use configuration file."); + logged = TRUE; + } + g_free(file); + file = g_build_filename(app->configdir, PREFS_FILE, NULL); + } + return file; + case MAX_PAYLOAD: + g_assert_not_reached(); + } + return NULL; +} + static GPtrArray *keyfile_groups[MAX_PAYLOAD]; GPtrArray *pref_groups;

@@ -666,12 +703,15 @@ static void save_ui_session(GKeyFile *config) } }

-void write_config_file(gchar const *filename, ConfigPayload payload) +static void write_config_file(ConfigPayload payload) { GKeyFile *config = g_key_file_new(); - gchar *configfile = g_build_filename(app->configdir, filename, NULL); + const gchar *filename; + gchar *configfile; gchar *data;

+ filename = payload == SESSION ? SESSION_FILE : PREFS_FILE; + configfile = g_build_filename(app->configdir, filename, NULL); g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL);

switch (payload) @@ -697,6 +737,8 @@ void write_config_file(gchar const *filename, ConfigPayload payload) } #endif break; + case MAX_PAYLOAD: + g_assert_not_reached(); }

/* new settings should be added in init_pref_groups() */ @@ -716,8 +758,8 @@ void configuration_save(void) /* save all configuration files * it is probably not very efficient to write both files every time * could be more selective about which file is saved when */ - write_config_file(PREFS_FILE, PREFS); - write_config_file(SESSION_FILE, SESSION); + write_config_file(PREFS); + write_config_file(SESSION); }

static void load_recent_files(GKeyFile *config, GQueue *queue, const gchar *key) @@ -1172,7 +1214,7 @@ void configuration_clear_default_session(void) */ void configuration_load_default_session(void) { - gchar *configfile = g_build_filename(app->configdir, SESSION_FILE, NULL); + gchar *configfile = get_keyfile_for_payload(SESSION); GKeyFile *config = g_key_file_new();

g_return_if_fail(default_session_files == NULL); @@ -1185,17 +1227,12 @@ void configuration_load_default_session(void) g_key_file_free(config); }

-gboolean read_config_file(gchar const *filename, ConfigPayload payload) +static gboolean read_config_file(ConfigPayload payload) { - gchar *configfile = g_build_filename(app->configdir, filename, NULL); GKeyFile *config = g_key_file_new(); + gchar *configfile;

- if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR)) - { /* config file does not (yet) exist, so try to load a global config file which may be */ - /* created by distributors */ - geany_debug("No user config file found, trying to use global configuration."); - SETPTR(configfile, g_build_filename(app->datadir, filename, NULL)); - } + configfile = get_keyfile_for_payload(payload); g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); g_free(configfile);

@@ -1222,6 +1259,8 @@ gboolean read_config_file(gchar const *filename, ConfigPayload payload) load_recent_files(config, ui_prefs.recent_queue, "recent_files"); load_recent_files(config, ui_prefs.recent_projects_queue, "recent_projects"); break; + case MAX_PAYLOAD: + g_assert_not_reached(); }

g_key_file_free(config); @@ -1231,17 +1270,9 @@ gboolean read_config_file(gchar const *filename, ConfigPayload payload)

gboolean configuration_load(void) { - gboolean prefs_loaded = read_config_file(PREFS_FILE, PREFS); - /* backwards-compatibility: try to read session from preferences if session file doesn't exist */ - gchar *session_filename = SESSION_FILE; - gchar *session_file = g_build_filename(app->configdir, session_filename, NULL); - if (! g_file_test(session_file, G_FILE_TEST_IS_REGULAR)) - { - geany_debug("No user session file found, trying to use configuration file."); - session_filename = PREFS_FILE; - } - g_free(session_file); - gboolean sess_loaded = read_config_file(session_filename, SESSION); + gboolean prefs_loaded = read_config_file(PREFS); + gboolean sess_loaded = read_config_file(SESSION); + return prefs_loaded && sess_loaded; }

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).