- gtk_text_buffer_set_text(location, text, -1);
- gtk_label_set_text(GTK_LABEL(locationnote), text);
+ gtk_entry_set_text(location, text);
+
+ text = dive->divemaster ? : "";
+ gtk_entry_set_text(divemaster, text);
+
+ text = dive->buddy ? : "";
+ gtk_entry_set_text(buddy, text);
+
+ text = "Dive Info";
+ if (dive->location && *dive->location)
+ text = dive->location;
+ len = 0;
+ if (dive->number)
+ len = snprintf(buffer, sizeof(buffer), "%d. ", dive->number);
+ snprintf(buffer+len, sizeof(buffer)-len, "%s", text);
+ gtk_frame_set_label(GTK_FRAME(info_frame), buffer);