mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 07:43:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'divetrip-nr' of git://git.hohndel.org/subsurface

Browse source 
Pull divetrip nr cleanup from Dirk Hohndel:
 "We don't need to manually track this - gtk gives us this number
  without any problems."

* 'divetrip-nr' of git://git.hohndel.org/subsurface:
  Stop tracking the number of dives in a dive trip
This commit is contained in:
Linus Torvalds 2012-08-30 09:14:51 -07:00
commit d93830a6eb
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
divelist.c
View file

@ -328,8 +328,8 @@ static void date_data_func(GtkTreeViewColumn *col,
time_t when; time_t when;
char buffer[40]; char buffer[40];
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DATE, &val, DIVE_NR, &nr, -1); gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DATE, &val, -1);
nr = gtk_tree_model_iter_n_children(model, iter);
/* 2038 problem */ /* 2038 problem */
when = val; when = val;
@ -904,7 +904,6 @@ static void fill_dive_list(void)
/* make sure we display the first date of the trip in previous summary */ /* make sure we display the first date of the trip in previous summary */
if (dive_trip && parent_ptr) { if (dive_trip && parent_ptr) {
gtk_tree_store_set(treestore, parent_ptr, gtk_tree_store_set(treestore, parent_ptr,
DIVE_NR, dive_trip->number,
DIVE_DATE, dive_trip->when, DIVE_DATE, dive_trip->when,
DIVE_LOCATION, dive_trip->location, DIVE_LOCATION, dive_trip->location,
-1); -1);
@ -947,15 +946,12 @@ static void fill_dive_list(void)
} }
} else { } else {
dive_trip = trip->data; dive_trip = trip->data;
dive_trip->number = 0;
} }
} }
} }
/* update dive_trip to include this dive, increase number of dives in /* update dive_trip time and (if necessary) location */
the trip and update location if necessary */
if (dive_trip) { if (dive_trip) {
dive->tripflag = IN_TRIP; dive->tripflag = IN_TRIP;
dive_trip->number++;
dive_trip->when = dive->when; dive_trip->when = dive->when;
if (!dive_trip->location && dive->location) if (!dive_trip->location && dive->location)
dive_trip->location = dive->location; dive_trip->location = dive->location;
@ -967,7 +963,6 @@ static void fill_dive_list(void)
/* a duration of 0 (and negative index) identifies a group */ /* a duration of 0 (and negative index) identifies a group */
gtk_tree_store_set(treestore, parent_ptr, gtk_tree_store_set(treestore, parent_ptr,
DIVE_INDEX, -1, DIVE_INDEX, -1,
DIVE_NR, dive_trip->number,
DIVE_DATE, dive_trip->when, DIVE_DATE, dive_trip->when,
DIVE_LOCATION, dive_trip->location, DIVE_LOCATION, dive_trip->location,
DIVE_DURATION, 0, DIVE_DURATION, 0,
@ -1008,7 +1003,6 @@ static void fill_dive_list(void)
/* make sure we display the first date of the trip in previous summary */ /* make sure we display the first date of the trip in previous summary */
if (parent_ptr && dive_trip) if (parent_ptr && dive_trip)
gtk_tree_store_set(treestore, parent_ptr, gtk_tree_store_set(treestore, parent_ptr,
DIVE_NR, dive_trip->number,
DIVE_DATE, dive_trip->when, DIVE_DATE, dive_trip->when,
DIVE_LOCATION, dive_trip->location, DIVE_LOCATION, dive_trip->location,
-1); -1);