Divide the panes evenly in view_three

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index d77fcd2d97adbf4c6eac1410bddc4424635f01d9..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);
@@ -226,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)
                {
@@ -239,5 +239,6 @@ int main(int argc, char **argv)
        report_dives(imported);
 
        run_ui();
+       exit_ui();
        return 0;
 }