+static int match_list(GtkListStore *list, const char *string)
+{
+ found_string_entry = MATCH_PREPEND;
+ gtk_tree_model_foreach(GTK_TREE_MODEL(list), match_string_entry, (void *)string);
+ return found_string_entry;
+}
+
+static void add_string_list_entry(const char *string, GtkListStore *list)
+{
+ GtkTreeIter *iter, loc;
+
+ if (!string || !*string)
+ return;
+
+ switch (match_list(list, string)) {
+ case MATCH_EXACT:
+ return;
+ case MATCH_PREPEND:
+ iter = NULL;
+ break;
+ case MATCH_AFTER:
+ iter = &string_entry_location;
+ break;
+ }
+ gtk_list_store_insert_after(list, &loc, iter);
+ gtk_list_store_set(list, &loc, 0, string, -1);
+}
+
+void add_people(const char *string)
+{
+ add_string_list_entry(string, people_list);
+}
+
+void add_location(const char *string)
+{
+ add_string_list_entry(string, location_list);
+}
+
+static int get_rating(const char *string)
+{
+ int rating_val = 0;
+ int i;
+
+ for (i = 0; i <= 5; i++)
+ if (!strcmp(star_strings[i],string))
+ rating_val = i;
+ return rating_val;
+}
+
+struct dive_info {
+ GtkComboBoxEntry *location, *divemaster, *buddy, *rating;
+ GtkTextView *notes;
+};
+
+static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
+{
+ char *old_text, *new_text;
+ char *rating_string;
+ int changed = 0;
+
+ new_text = get_combo_box_entry_text(info->location, &dive->location);
+ if (new_text) {
+ add_location(new_text);
+ changed = 1;
+ }
+
+ new_text = get_combo_box_entry_text(info->divemaster, &dive->divemaster);
+ if (new_text) {
+ add_people(new_text);
+ changed = 1;
+ }
+
+ new_text = get_combo_box_entry_text(info->buddy, &dive->buddy);
+ if (new_text) {
+ add_people(new_text);
+ changed = 1;
+ }
+
+ rating_string = strdup(star_strings[dive->rating]);
+ new_text = get_combo_box_entry_text(info->rating, &rating_string);
+ if (new_text) {
+ dive->rating = get_rating(rating_string);
+ free(rating_string);
+ changed =1;
+ }
+
+ old_text = dive->notes;
+ dive->notes = get_text(info->notes);
+ if (text_changed(old_text,dive->notes))
+ changed = 1;
+ if (old_text)
+ g_free(old_text);
+
+ if (changed) {
+ mark_divelist_changed(TRUE);
+ update_dive(dive);
+ }
+}
+
+static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info)