Fixing whitespace, line wrapping

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index a82cffc2bc8c9de71fe7a38a5c08c27df94d911e..d77fcd2d97adbf4c6eac1410bddc4424635f01d9 100644 (file)
--- 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);
@@ -185,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;
 }
@@ -216,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];