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>
This commit is contained in:
Linus Torvalds 2013-01-11 17:07:22 -08:00 committed by Dirk Hohndel
parent 954290c70b
commit 6a10700ca5
11 changed files with 84 additions and 89 deletions

6
pref.h
View file

@ -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);