summaryrefslogtreecommitdiffstats
path: root/core/load-git.c
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@gmail.com>2016-08-10 13:27:03 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-08-27 10:55:40 -0700
commit81d5d82b7bfb1a7a1cfe44b8d33befe9b31a2099 (patch)
tree31392ef07c43c9ac68ca95805b4865c5859c0848 /core/load-git.c
parent048379cc2b56257be4a435bb707d8a18c9958371 (diff)
downloadsubsurface-81d5d82b7bfb1a7a1cfe44b8d33befe9b31a2099.tar.gz
Settings update: Clean up save user id local
So, prefs.save_userid_local is being set outside of a preferences set (it's set to true and false while loading the files via xml or git) and because of that I had to bypass a few method calls. When something triggers a preferences change, the application will be notified that the preferences changed, thing that I couldn't do while reading the xml or git because that should be local-only. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/load-git.c')
-rw-r--r--core/load-git.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/load-git.c b/core/load-git.c
index 670658d1b..abe1a5ad0 100644
--- a/core/load-git.c
+++ b/core/load-git.c
@@ -811,7 +811,7 @@ static void parse_settings_userid(char *line, struct membuffer *str, void *_unus
(void) str;
(void) _unused;
if (line) {
- set_save_userid_local(true);
+ prefs.save_userid_local = true;
set_userid(line);
}
}
@@ -1520,7 +1520,7 @@ static int parse_settings_entry(git_repository *repo, const git_tree_entry *entr
git_blob *blob = git_tree_entry_blob(repo, entry);
if (!blob)
return report_error("Unable to read settings file");
- set_save_userid_local(false);
+ prefs.save_userid_local = false;
for_each_line(blob, settings_parser, NULL);
git_blob_free(blob);
return 0;