X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=f29712e2c382e437e66db5a7cc2e460e992bc482;hb=bf13c14d16fdb1aa0230f688ff88635f395c6887;hp=42d91d630a0776f63b8605d61e6e5f1c429578a0;hpb=30ee87be92f0a0fffc98106852d9623a65dfe4ed;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index 42d91d6..f29712e 100644 --- a/dive.h +++ b/dive.h @@ -201,7 +201,7 @@ extern struct units input_units, output_units; extern int verbose; struct dive_table { - int nr, allocated; + int nr, allocated, preexisting; struct dive **dives; }; @@ -243,7 +243,7 @@ extern void record_dive(struct dive *dive); extern struct sample *prepare_sample(struct dive **divep); extern void finish_sample(struct dive *dive, struct sample *sample); -extern void report_dives(void); +extern void report_dives(gboolean imported); extern struct dive *fixup_dive(struct dive *dive); extern struct dive *try_to_merge(struct dive *a, struct dive *b); @@ -262,8 +262,6 @@ extern void report_error(GError* error); extern void dive_list_update_dives(void); extern void flush_divelist(struct dive *dive); -extern int open_import_file_dialog(char *filterpattern, char *filtertext, - void(* parse_function)(char *)); #define DIVE_ERROR_PARSE 1 const char *weekday(int wday);