X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=67e19b02b20eed85897426b12c7b1a0f09414f6b;hb=c544226334ec1bfaac1c8d649722bb17728606e1;hp=680bf217126388154db9b40a0d744ca5768b6e7b;hpb=619ab9e828d4db7b0c4089018b09892c9d04ece9;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index 680bf21..67e19b0 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,8 +186,6 @@ 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) {
@@ -218,7 +216,7 @@ int main(int argc, char **argv)
 
 	parse_xml_init();
 
-	init_ui(argc, argv);
+	init_ui(&argc, &argv);
 	
 	for (i = 1; i < argc; i++) {
 		const char *a = argv[i];