X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=main.c;h=2489473b9c2f9fe43f65c4ce0405fba3b79e7cc6;hp=9aaa5d1f42ca61b384fb37740a7ebbbefe9472dc;hb=HEAD;hpb=55352a051cfa7ac519e397cd3d18851e5050517b

diff --git a/main.c b/main.c
index 9aaa5d1..2489473 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);
@@ -172,7 +172,7 @@ static void parse_argument(const char *arg)
 			if (strncmp(arg, "-psn_", 5) == 0) {
 				return;
 			}
-			/* fallthrough */ 
+			/* fallthrough */
 		default:
 			fprintf(stderr, "Bad argument '%s'\n", arg);
 			exit(1);
@@ -186,13 +186,11 @@ 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_equipment(new_dive, W_IDX_PRIMARY);
 		show_dive_stats(new_dive);
 	}
 	buffered_dive = new_dive;
@@ -219,7 +217,7 @@ int main(int argc, char **argv)
 	parse_xml_init();
 
 	init_ui(&argc, &argv);
-	
+
 	for (i = 1; i < argc; i++) {
 		const char *a = argv[i];
 
@@ -228,8 +226,8 @@ int main(int argc, char **argv)
 			continue;
 		}
 		GError *error = NULL;
-		parse_xml_file(a, &error);
-		
+		parse_file(a, &error);
+
 		if (error != NULL)
 		{
 			report_error(error);
@@ -241,5 +239,6 @@ int main(int argc, char **argv)
 	report_dives(imported);
 
 	run_ui();
+	exit_ui();
 	return 0;
 }