+static GtkEntry *location, *buddy, *divemaster;
+static GtkTextBuffer *notes;
+static int location_changed = 1, notes_changed = 1;
+static int divemaster_changed = 1, buddy_changed = 1;
+
+static char *get_text(GtkTextBuffer *buffer)
+{
+ GtkTextIter start;
+ GtkTextIter end;
+
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ gtk_text_buffer_get_end_iter(buffer, &end);
+ return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+}
+
+/* old is NULL or a valid string, new is a valid string
+ * NOTW: NULL and "" need to be treated as "unchanged" */
+static int text_changed(char *old, char *new)
+{
+ return ((old && strcmp(old,new)) ||
+ (!old && strcmp("",new)));
+}
+
+void flush_dive_info_changes(struct dive *dive)
+{
+ char *old_text;
+ int changed = 0;
+
+ if (!dive)
+ return;
+
+ if (location_changed) {
+ old_text = dive->location;
+ dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1);
+ if (text_changed(old_text,dive->location))
+ changed = 1;
+ if (old_text)
+ g_free(old_text);
+ }
+
+ if (divemaster_changed) {
+ old_text = dive->divemaster;
+ dive->divemaster = gtk_editable_get_chars(GTK_EDITABLE(divemaster), 0, -1);
+ if (text_changed(old_text,dive->divemaster))
+ changed = 1;
+ if (old_text)
+ g_free(old_text);
+ }
+
+ if (buddy_changed) {
+ old_text = dive->buddy;
+ dive->buddy = gtk_editable_get_chars(GTK_EDITABLE(buddy), 0, -1);
+ if (text_changed(old_text,dive->buddy))
+ changed = 1;
+ if (old_text)
+ g_free(old_text);
+ }
+
+ if (notes_changed) {
+ old_text = dive->notes;
+ dive->notes = get_text(notes);
+ if (text_changed(old_text,dive->notes))
+ changed = 1;
+ if (old_text)
+ g_free(old_text);
+ }
+ if (changed)
+ mark_divelist_changed(TRUE);
+}
+
+#define SET_TEXT_ENTRY(x) \
+ gtk_entry_set_text(x, dive && dive->x ? dive->x : "")
+
+void show_dive_info(struct dive *dive)