Associate each dive trip with the dives in that trip

We already kept a count of dives per trip in order to figure out when
there are no more dives left and the trip needs to be freed.  Now we
explicitly keep track of the list of dives associated with the trip too,
which simplifies the "find the time of the trip" logic.

We may want to sort it in time, but for now this is mainly about trying
to keep track of the divetrip relationships explicitly.  I want to move
away from the whole "use the gtk tree model to keep track of things"
approach.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/dive.h b/dive.h
index 44023b705..43b7b8d59 100644
--- a/dive.h
+++ b/dive.h
@@ -278,6 +278,7 @@ typedef struct dive_trip {
 	timestamp_t when_from_file;
 	char *location;
 	char *notes;
+	struct dive *dives;
 	int nrdives;
 	int expanded:1, selected:1;
 } dive_trip_t;
@@ -286,6 +287,7 @@ struct dive {
 	int number;
 	tripflag_t tripflag;
 	dive_trip_t *divetrip;
+	struct dive *next, **pprev;
 	int selected;
 	gboolean downloaded;
 	int start, end;