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>
This commit is contained in:
Linus Torvalds 2011-10-05 08:06:48 -07:00
parent 0e29df87f4
commit f4820455e2
2 changed files with 2 additions and 3 deletions

View file

@ -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)

3
main.c
View file

@ -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;