Divide the panes evenly in view_three

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index f34e3ae51b3f3fa952bf69cb6373b1eefef788ca..60f2902e60f685d86b7c6d601f847b963b66a465 100644 (file)
--- 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);
@@ -167,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);
@@ -180,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;
 }
@@ -211,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];
@@ -221,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)
                {
@@ -234,5 +239,6 @@ int main(int argc, char **argv)
        report_dives(imported);
 
        run_ui();
+       exit_ui();
        return 0;
 }