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>
This commit is contained in:
Dirk Hohndel 2013-04-15 07:06:32 -07:00
parent 0a9ad49f0a
commit bfe21343ca
2 changed files with 1 additions and 9 deletions

View file

@ -59,7 +59,6 @@ static struct DiveList dive_list;
#define TREESTORE(_dl) GTK_TREE_STORE((_dl).treemodel) #define TREESTORE(_dl) GTK_TREE_STORE((_dl).treemodel)
#define LISTSTORE(_dl) GTK_TREE_STORE((_dl).listmodel) #define LISTSTORE(_dl) GTK_TREE_STORE((_dl).listmodel)
dive_trip_t *dive_trip_list;
short autogroup = FALSE; short autogroup = FALSE;
static gboolean in_set_cursor = FALSE; static gboolean in_set_cursor = FALSE;
static gboolean set_selected(GtkTreeModel *model, GtkTreePath *path, static gboolean set_selected(GtkTreeModel *model, GtkTreePath *path,
@ -686,14 +685,6 @@ void update_dive_list_col_visibility(void)
return; 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 */ /* Select the iter asked for, and set the keyboard focus on it */
static void go_to_iter(GtkTreeSelection *selection, GtkTreeIter *iter); static void go_to_iter(GtkTreeSelection *selection, GtkTreeIter *iter);
static void fill_dive_list(void) static void fill_dive_list(void)

View file

@ -22,6 +22,7 @@ extern void upload_all_dives_divelogs_cb();
#endif #endif
/* divelist core logic functions */ /* divelist core logic functions */
extern void clear_trip_indexes(void);
extern dive_trip_t *find_trip_by_idx(int idx); 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 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); extern int trip_has_selected_dives(dive_trip_t *trip);