X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=9aaa5d1f42ca61b384fb37740a7ebbbefe9472dc;hb=abdee5b1b8a97c641bca9bc2ebac9555c3e2ea54;hp=ee09b9a82e50b4ee0bceda0ef9eebdd7cadaae64;hpb=6231b64d3de47dde9420d35ea7e6d620a3a2b966;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index ee09b9a..9aaa5d1 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)
 {
@@ -172,6 +167,12 @@ static void parse_argument(const char *arg)
 				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);
@@ -192,6 +193,7 @@ void update_dive(struct dive *new_dive)
 	if (new_dive) {
 		show_dive_info(new_dive);
 		show_dive_equipment(new_dive);
+		show_dive_stats(new_dive);
 	}
 	buffered_dive = new_dive;
 }
@@ -203,6 +205,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);
 }
@@ -215,7 +218,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];