aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-04-15 07:06:32 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-04-15 07:12:44 -0700
commitdb180bf46e28aea3cc7dad2a695b1e0fa1b20e1e (patch)
treeaed3aebcfb0c49b3862552df1e32fb5cb5884794
parent944d286132fe9529f7f6281c71b291af3ed937bc (diff)
downloadsubsurface-db180bf46e28aea3cc7dad2a695b1e0fa1b20e1e.tar.gz
Remove second dive_trip_list definition and douplicate helper function
dive_trip_list is simply a global variable, declared in dive.h. The clear_trip_indexes() helper is purely logic and was moved to divetrip.c - but then not deleted in divetrip-gtk.c Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--divelist-gtk.c9
-rw-r--r--divelist.h1
2 files changed, 1 insertions, 9 deletions
diff --git a/divelist-gtk.c b/divelist-gtk.c
index dc441881c..5420f9e1a 100644
--- a/divelist-gtk.c
+++ b/divelist-gtk.c
@@ -59,7 +59,6 @@ static struct DiveList dive_list;
#define TREESTORE(_dl) GTK_TREE_STORE((_dl).treemodel)
#define LISTSTORE(_dl) GTK_TREE_STORE((_dl).listmodel)
-dive_trip_t *dive_trip_list;
short autogroup = FALSE;
static gboolean in_set_cursor = FALSE;
static gboolean set_selected(GtkTreeModel *model, GtkTreePath *path,
@@ -686,14 +685,6 @@ void update_dive_list_col_visibility(void)
return;
}
-static void clear_trip_indexes(void)
-{
- dive_trip_t *trip;
-
- for (trip = dive_trip_list; trip != NULL; trip = trip->next)
- trip->index = 0;
-}
-
/* Select the iter asked for, and set the keyboard focus on it */
static void go_to_iter(GtkTreeSelection *selection, GtkTreeIter *iter);
static void fill_dive_list(void)
diff --git a/divelist.h b/divelist.h
index 4772f89d9..e7de9e631 100644
--- a/divelist.h
+++ b/divelist.h
@@ -21,6 +21,7 @@ extern double init_decompression(struct dive * dive);
extern void export_all_dives_uddf_cb();
/* divelist core logic functions */
+extern void clear_trip_indexes(void);
extern dive_trip_t *find_trip_by_idx(int idx);
extern int dive_nr_sort(int idx_a, int idx_b, timestamp_t when_a, timestamp_t when_b);
extern int trip_has_selected_dives(dive_trip_t *trip);