diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-09-23 21:57:28 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-09-23 21:57:28 -0700 |
| commit | be418458dbf4299ef289b2790ac36e3efa3b5261 (patch) | |
| tree | 6867b015b11d323407955c5845b1461faec8bc18 /divelist.h | |
| parent | c6140c6e21aeff4c6e27e67bee407a1c3f552b18 (diff) | |
| download | subsurface-be418458dbf4299ef289b2790ac36e3efa3b5261.tar.gz | |
Add "merge selected dives" to dive list popup menu
This is fairly straight forward. What I dislike is the check for the magic
number of "14 indeces". I'm sure there's a better way to tell if more than
one dive is selected...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divelist.h')
| -rw-r--r-- | divelist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/divelist.h b/divelist.h index ef90c4283..1485dd97b 100644 --- a/divelist.h +++ b/divelist.h @@ -43,7 +43,7 @@ extern dive_trip_t *find_matching_trip(timestamp_t when); extern void remove_dive_from_trip(struct dive *dive); extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive); extern void autogroup_dives(void); -extern void merge_dive_index(int i, struct dive *a); +extern struct dive *merge_two_dives(struct dive *a, struct dive *b); extern void select_dive(int idx); extern void deselect_dive(int idx); |