X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=main.c;h=60f2902e60f685d86b7c6d601f847b963b66a465;hp=471abc7b4acee1f1c1f4ddca9c6a16784d19630d;hb=618a20ba5f2a9adc0e5a35117535f8eaa9fd34a4;hpb=e4bfb6597279ca3d9aa3678a617f5f0aef298278 diff --git a/main.c b/main.c index 471abc7..60f2902 100644 --- a/main.c +++ b/main.c @@ -101,7 +101,7 @@ static gboolean imported = FALSE; * This doesn't really report anything at all. We just sort the * dives, the GUI does the reporting */ -void report_dives(gboolean imported) +void report_dives(gboolean is_imported) { int i; int preexisting = dive_table.preexisting; @@ -135,7 +135,7 @@ void report_dives(gboolean imported) i--; } - if (imported) { + if (is_imported) { /* Was the previous dive table state numbered? */ if (last && last->number) try_to_renumber(last, preexisting); @@ -186,13 +186,12 @@ void update_dive(struct dive *new_dive) struct dive *old_dive = buffered_dive; if (old_dive) { - flush_dive_info_changes(old_dive); - flush_dive_equipment_changes(old_dive); flush_divelist(old_dive); } if (new_dive) { show_dive_info(new_dive); show_dive_equipment(new_dive); + show_dive_stats(new_dive); } buffered_dive = new_dive; } @@ -227,7 +226,7 @@ int main(int argc, char **argv) continue; } GError *error = NULL; - parse_xml_file(a, &error); + parse_file(a, &error); if (error != NULL) { @@ -240,5 +239,6 @@ int main(int argc, char **argv) report_dives(imported); run_ui(); + exit_ui(); return 0; }