X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=main.c;h=60f2902e60f685d86b7c6d601f847b963b66a465;hp=26d2eee220bcbdcc8b4d4096aeadee336a025178;hb=618a20ba5f2a9adc0e5a35117535f8eaa9fd34a4;hpb=dbdd42b31f73ad8e8117d5b2a5b4ac4e061bf202

diff --git a/main.c b/main.c
index 26d2eee..60f2902 100644
--- a/main.c
+++ b/main.c
@@ -4,16 +4,11 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <gconf/gconf-client.h>
-
 #include "dive.h"
 #include "divelist.h"
 
-GConfClient *gconf;
 struct units output_units;
 
-#define GCONF_NAME(x) "/apps/subsurface/" #x
-
 /* random helper functions, used here or elsewhere */
 static int sortfn(const void *_a, const void *_b)
 {
@@ -97,11 +92,16 @@ static void try_to_renumber(struct dive *last, int preexisting)
 	}
 }
 
+/*
+ * track whether we switched to importing dives
+ */
+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);
@@ -162,10 +162,17 @@ static void parse_argument(const char *arg)
 			if (strcmp(arg,"--import") == 0) {
 				/* mark the dives so far as the base,
 				 * everything after is imported */
-				report_dives(TRUE);
+				report_dives(FALSE);
+				imported = TRUE;
 				return;
 			}
 			/* fallthrough */
+		case 'p':
+			/* ignore process serial number argument when run as native macosx app */
+			if (strncmp(arg, "-psn_", 5) == 0) {
+				return;
+			}
+			/* fallthrough */ 
 		default:
 			fprintf(stderr, "Bad argument '%s'\n", arg);
 			exit(1);
@@ -179,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;
 }
@@ -197,6 +203,7 @@ void renumber_dives(int nr)
 	for (i = 0; i < dive_table.nr; i++) {
 		struct dive *dive = dive_table.dives[i];
 		dive->number = nr + i;
+		flush_divelist(dive);
 	}
 	mark_divelist_changed(TRUE);
 }
@@ -209,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];
@@ -219,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)
 		{
@@ -229,8 +236,9 @@ int main(int argc, char **argv)
 		}
 	}
 
-	report_dives(FALSE);
+	report_dives(imported);
 
 	run_ui();
+	exit_ui();
 	return 0;
 }