diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-09-17 21:27:43 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-09-17 21:44:28 -0400 |
| commit | 3835faa8fb02df8edb299278f4258389d3e99bda (patch) | |
| tree | 6ac1697a5f7343157f73ad5063b2cefa23395e20 /dive.h | |
| parent | febae4d165866ca4a4e28347aebe446d65ed44e5 (diff) | |
| parent | d7465129bb7fc912ec89671051192983b80711c4 (diff) | |
| download | subsurface-3835faa8fb02df8edb299278f4258389d3e99bda.tar.gz | |
Merge branch 'defaultfile'
By now the default file code seems quite matured, so in preparation for
2.0 we'll bring it back into master.
I made a few small clean-ups during the merge, but the merge itself is
very much straight forward.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
| -rw-r--r-- | dive.h | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -5,6 +5,7 @@ #include <time.h> #include <glib.h> +#include <glib/gstdio.h> #include <libxml/tree.h> /* @@ -384,7 +385,7 @@ static inline struct dive *get_dive(unsigned int nr) extern void parse_xml_init(void); extern void parse_xml_buffer(const char *url, const char *buf, int size, GError **error); -extern void set_filename(const char *filename); +extern void set_filename(const char *filename, gboolean force); extern void parse_file(const char *filename, GError **error); @@ -395,8 +396,10 @@ extern xmlDoc *test_xslt_transforms(xmlDoc *doc); extern void show_dive_info(struct dive *); extern void show_dive_equipment(struct dive *, int w_idx); +extern void clear_equipment_widgets(void); extern void show_dive_stats(struct dive *); +extern void clear_stats_widgets(void); extern void show_yearly_stats(void); @@ -466,6 +469,9 @@ const char *monthname(int mon); #define FIVE_STARS UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR extern const char *star_strings[]; +extern const char *default_filename; +extern const char *existing_filename; +extern const char *subsurface_default_filename(void); #define AIR_PERMILLE 209 #define FRACTION(n,x) ((unsigned)(n)/(x)),((unsigned)(n)%(x)) |