* 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;
i--;
}
- if (imported) {
+ if (is_imported) {
/* Was the previous dive table state numbered? */
if (last && last->number)
try_to_renumber(last, preexisting);
if (strncmp(arg, "-psn_", 5) == 0) {
return;
}
- /* fallthrough */
+ /* fallthrough */
default:
fprintf(stderr, "Bad argument '%s'\n", arg);
exit(1);
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_equipment(new_dive, W_IDX_PRIMARY);
+ show_dive_stats(new_dive);
}
buffered_dive = new_dive;
}
parse_xml_init();
init_ui(&argc, &argv);
-
+
for (i = 1; i < argc; i++) {
const char *a = argv[i];
continue;
}
GError *error = NULL;
- parse_xml_file(a, &error);
-
+ parse_file(a, &error);
+
if (error != NULL)
{
report_error(error);
report_dives(imported);
run_ui();
+ exit_ui();
return 0;
}