XSLT to transform JDiveLog to Subsurface format

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 26d2eee220bcbdcc8b4d4096aeadee336a025178..f34e3ae51b3f3fa952bf69cb6373b1eefef788ca 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)
 {
@@ -97,6 +92,11 @@ 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
@@ -162,7 +162,8 @@ 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 */
@@ -197,6 +198,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);
 }
@@ -229,7 +231,7 @@ int main(int argc, char **argv)
                }
        }
 
-       report_dives(FALSE);
+       report_dives(imported);
 
        run_ui();
        return 0;