* NOTW: NULL and "" need to be treated as "unchanged" */
static int text_changed(const char *old, const char *new)
{
- return ((old && strcmp(old,new)) ||
- (!old && strcmp("",new)));
+ return (old && strcmp(old,new)) ||
+ (!old && strcmp("",new));
}
static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
static int get_rating(const char *string)
{
- int rating = 0;
+ int rating_val = 0;
int i;
for (i = 0; i <= 5; i++)
if (!strcmp(star_strings[i],string))
- rating = i;
- return rating;
+ rating_val = i;
+ return rating_val;
}
struct dive_info {
info->divemaster = text_entry(hbox, "Dive master", people_list, dive->divemaster);
info->buddy = text_entry(hbox, "Buddy", people_list, dive->buddy);
+
+ hbox = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
+
info->rating = text_entry(hbox, "Rating", star_list, star_strings[dive->rating]);
info->notes = text_view(box, "Notes", READ_WRITE);
divemaster = text_value(hbox, "Divemaster");
buddy = text_value(hbox, "Buddy");
+
+ hbox = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
rating = text_value(hbox, "Rating");
notes = text_view(vbox, "Notes", READ_ONLY);