Fix "prefer download" behavior

When this was first implemented the assumption was that a downloaded dive
that is to be merged with an existing dive would have the same time stamp.
But as Linus pointed out even back then, this does fail if a dive has been
merged with a download from a different dive computer before (think:
download from computer a, then download same dive from b, then improve
something in the parsing from computer a and try to redownload; the time
stamp could have changed).

This commit also fixes a silly omission in the merge_dives() function
(which ended up ALWAYS prefering the downloaded dive) and finally
implements the necessary changes to mark dives downloaded from a Uemis SDA
as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/dive.h b/dive.h
index 7131b3eaf..d4e2d3eaf 100644
--- a/dive.h
+++ b/dive.h
@@ -392,7 +392,7 @@ static inline struct dive *get_dive(int nr)
 	for ((_i) = 0; ((_x) = get_dive(_i)) != NULL; (_i)++)
 
 extern void parse_xml_init(void);
-extern void parse_xml_buffer(const char *url, const char *buf, int size, GError **error);
+extern void parse_xml_buffer(const char *url, const char *buf, int size, gboolean downloaded, GError **error);
 extern void parse_xml_exit(void);
 extern void set_filename(const char *filename, gboolean force);