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>

1 files changed, 4 insertions, 2 deletions

diff --git a/pref.h b/pref.h
index 18a648032..342c9f6a9 100644
--- a/pref.h
+++ b/pref.h
@@ -30,6 +30,8 @@ struct preferences {
 	gboolean calc_ceiling_3m_incr;
 	double gflow;
 	double gfhigh;
+	const char *divelist_font;
+	const char *default_filename;
 };
 
 extern struct preferences prefs, default_prefs;
@@ -45,8 +47,8 @@ extern int subsurface_get_conf_bool(char *name);
 extern void subsurface_flush_conf(void);
 extern void subsurface_close_conf(void);
 
-/* Misc preferences - should we have defaults for these too? */
-extern const char *divelist_font;
+extern const char system_divelist_default_font[];
+extern const char *system_default_filename();
 
 extern void load_preferences(void);
 extern void save_preferences(void);