diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-24 12:21:11 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-01-24 12:59:36 -0800 |
| commit | b8efe709a8e6c23a2bf3849a454565634b2a0545 (patch) | |
| tree | e97dba0652b5c7ef78681f6fba4c1544261480bc /parse-xml.c | |
| parent | 52050fdc921bc6404ae637eee6169b684f62c244 (diff) | |
| download | subsurface-b8efe709a8e6c23a2bf3849a454565634b2a0545.tar.gz | |
Remove saving of dive computer nicnames in system config
We save the (more complete) dive computer information in the XML file
with serial numbers and firmware version if we know about them, so using
a complicated string in the system config was redundant and confusing.
So remove that code.
NOTE! Since the dive computer nicknames are now only saved if the XML
file is saved, we also mark the dive list "changed" when we edit the
nicknames. That way we'll be prompted to save things before exiting,
even if we don't actually edit any actual dive data.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/parse-xml.c b/parse-xml.c index ba5ca1e50..a4fb3a051 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -1127,9 +1127,6 @@ static void dc_settings_end(void) { struct device_info *info; - if (cur_settings.dc.model) - remember_dc(cur_settings.dc.model, cur_settings.dc.deviceid, cur_settings.dc.nickname, TRUE); - info = create_device_info(cur_settings.dc.model, cur_settings.dc.deviceid); if (info) { if (!info->serial_nr && cur_settings.dc.serial_nr) |