aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-10-29 07:23:41 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-10-29 07:23:41 -0700
commit28247d3baa9967fa39772c41077e714c4c533c82 (patch)
tree7b13f2de12b7bfda58120dafd6dff1ad91750e45
parent2101f37c1b81840beda99a7b4e87e938f9e52a7a (diff)
parent84f570beef789695f080f9109febcff384d98c50 (diff)
downloadsubsurface-28247d3baa9967fa39772c41077e714c4c533c82.tar.gz
Merge branches 'mingw-port-cleanup' and 'combobox-text-entry-fix' of git://github.com/dirkhh/subsurface
* 'mingw-port-cleanup' of git://github.com/dirkhh/subsurface: Use Registry on Windows to store preferences * 'combobox-text-entry-fix' of git://github.com/dirkhh/subsurface: Update the known locations / buddies / divemasters as user enters them
-rw-r--r--info.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/info.c b/info.c
index 83ba09b2a..9b71b6591 100644
--- a/info.c
+++ b/info.c
@@ -53,6 +53,7 @@ void flush_dive_info_changes(struct dive *dive)
char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(location));
old_text = dive->location;
dive->location = new_text;
+ add_location(new_text);
if (text_changed(old_text,dive->location))
changed = 1;
if (old_text)
@@ -63,6 +64,7 @@ void flush_dive_info_changes(struct dive *dive)
char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(divemaster));
old_text = dive->divemaster;
dive->divemaster = new_text;
+ add_people(new_text);
if (text_changed(old_text,dive->divemaster))
changed = 1;
if (old_text)
@@ -73,6 +75,7 @@ void flush_dive_info_changes(struct dive *dive)
char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(buddy));
old_text = dive->buddy;
dive->buddy = new_text;
+ add_people(new_text);
if (text_changed(old_text,dive->buddy))
changed = 1;
if (old_text)