Fix selection and trip expansion logic after merging dives

[Linus Torvalds]

This just makes sure that the merged dive is properly selected, and
that we've saved the trip tree state so that the dive list repaints
nicely and with the newly merged dive selected after the merge.

Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch.diff
Type: application/octet-stream
Size: 1045 bytes
Desc: not available
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20121111/33e1a71f/attachment.obj>