X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=6a4a296b004013d7b77ba9bb746b79225385f6d7;hb=c544226334ec1bfaac1c8d649722bb17728606e1;hp=377f33caa7071f4011f507077d4f7b75c9fea1f4;hpb=50d026230fa7303b33821da1346875b30f5ab00d;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index 377f33c..6a4a296 100644 --- a/info.c +++ b/info.c @@ -38,8 +38,8 @@ static char *get_text(GtkTextView *view) * 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) @@ -258,13 +258,13 @@ void add_location(const char *string) 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 { @@ -333,6 +333,10 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, 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); @@ -400,6 +404,10 @@ GtkWidget *extended_dive_info_widget(void) 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);