X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=5fed4cd6ed0e5b74b140e7bf8a8971eab9f24c45;hb=56980579514f2900e43441b483e435b3e3235266;hp=a82cffc2bc8c9de71fe7a38a5c08c27df94d911e;hpb=a72408400c67a142b9abaec89df954df7dac7a71;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index a82cffc..5fed4cd 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);