diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 12:44:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 12:44:55 -0700 |
| commit | 252c28f8f28614383167a20105ef68f4e5b4eb4c (patch) | |
| tree | 196d323233855984209e206019e600737c25f1e1 /parse-xml.c | |
| parent | d20428973acbd9dd052ae5213098f5ff59df924a (diff) | |
| parent | 4679f4fbbc1f303b963b4eabebbbc9c684299619 (diff) | |
| download | subsurface-252c28f8f28614383167a20105ef68f4e5b4eb4c.tar.gz | |
Merge branch 'trip3' of git://git.hohndel.org/subsurface
Pull trip manipulation branch from Dirk Hohndel:
"I have added yet more of the requested features.
I am not aware of any outstanding bugs or crashes (except for the Gtk
problem that causes the import to crash for some people on Ubuntu and
MacOS - but as I mentioned earlier, that bug has been around as long
as the import file selector box)."
* 'trip3' of git://git.hohndel.org/subsurface:
Avoid duplicate dive_trip entries
More trip manipulations: remove selected dives from trip
Add ability to merge trip with trip below
Use the infrastructure for moving dives in more places
Correct the trip related test dives
Fix crash when removing the first dive of a trip
Correctly initialize the toggle state of the autogroup menu entry
Fix copy_tree_node to no longer overwrite dive duration
Add autogen menu command
Fix a crash when changing sort column
Use truth values with gboolean
Allow modification and edits of trips
Clean up macros and auxiliary functions
Store time_t as long value
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/parse-xml.c b/parse-xml.c index 59e9278ad..1c4db7d9d 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -39,11 +39,6 @@ void record_dive(struct dive *dive) dive_table.nr = nr+1; } -void record_trip(struct dive *trip) -{ - dive_trip_list = insert_trip(trip, dive_trip_list); -} - static void delete_dive_renumber(struct dive **dives, int i, int nr) { struct dive *dive = dives[i]; @@ -1165,10 +1160,10 @@ static void try_to_fill_trip(struct dive **divep, const char *name, char *buf) struct dive *dive = *divep; - if (MATCH(".date", divedate, &dive->when)) { - dive->when = utc_mktime(&cur_tm); + if (MATCH(".date", divedate, &dive->when)) + return; + if (MATCH(".time", divetime, &dive->when)) return; - } if (MATCH(".location", utf8_string, &dive->location)) return; if (MATCH(".notes", utf8_string, &dive->notes)) @@ -1213,7 +1208,7 @@ static void trip_end(void) { if (!cur_trip) return; - record_trip(cur_trip); + insert_trip(&cur_trip); cur_trip = NULL; } |