summaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2013-01-11 17:07:22 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-01-11 17:46:00 -0800
commit6a10700ca59e546c7a05688bdf5bffa388286bff (patch)
tree1cef21cc47580f1f64b0f186ebb712bca5b0cc24 /file.c
parent954290c70ba525cab4fefe83a3e82384ef01ba8c (diff)
downloadsubsurface-6a10700ca59e546c7a05688bdf5bffa388286bff.tar.gz
Add default filename and divelist font to prefs structure
.. and add the usual logic to not save the default values. This also simplifies the initial system-specific setup of both of these: since we have defaults for all the preferences that get set up at startup, we can just initialize those defaults to the system-specific fonts then and there. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.c b/file.c
index ecbc53df8..2e40872a1 100644
--- a/file.c
+++ b/file.c
@@ -255,7 +255,7 @@ void parse_file(const char *filename, GError **error, gboolean possible_default_
if (readfile(filename, &mem) < 0) {
/* we don't want to display an error if this was the default file */
- if (default_filename && ! strcmp(filename, default_filename))
+ if (prefs.default_filename && ! strcmp(filename, prefs.default_filename))
return;
g_warning(_("Failed to read '%s'.\n"), filename);