Merge branches 'mingw-port-cleanup' and 'combobox-text-entry-fix' of git://github...

* '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

diff --git a/info.c b/info.c
index 83ba09b2a7e68398e90bc86e1fab304ba6e09219..9b71b659166f6b41dd1474057d6e15531c7a4720 100644 (file)
--- 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)