Move 'dive_list_update_dives()' call into 'report_dives()'

All the callers were always calling report_dives first, followed by
dive_list_update_dives().  And there really was no reason to have the
callers call two separate functions for the "I've added new dives" case.
So just call dive_list_update_dives() directly from report_dives(), and
remove it from the callers.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/gtk-gui.c b/gtk-gui.c
index d6ab412c76337c583d61aef9fe37404839f7a986..cecfb7259107eb329e0390aa322fc01b47f4743f 100644 (file)
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -130,7 +130,6 @@ static void file_open(GtkWidget *w, gpointer data)
                }
                g_slist_free(filenames);
                report_dives();
-               dive_list_update_dives();
        }
        gtk_widget_destroy(dialog);
 }
@@ -881,7 +880,6 @@ void import_dialog(GtkWidget *w, gpointer data)
        gtk_widget_destroy(dialog);
 
        report_dives();
-       dive_list_update_dives();
 }
 
 void update_progressbar(progressbar_t *progress, double value)

diff --git a/main.c b/main.c
index 92eb9ee0992cccc37df60b0ee36b7095762ecacd..d259b388888214bf9b3defdb1f88dcbe8ad364e0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -76,6 +76,8 @@ void report_dives(void)
                /* Redo the new 'i'th dive */
                i--;
        }
+
+       dive_list_update_dives();
 }
 
 static void parse_argument(const char *arg)
@@ -150,7 +152,6 @@ int main(int argc, char **argv)
        }
 
        report_dives();
-       dive_list_update_dives();
 
        run_ui();
        return 0;