Show dive number (if it exists) in the location note

[ext/subsurface.git] / info.c

diff --git a/info.c b/info.c
index b789d9fd8a6916923e29ccfa7069e69df46e9a7a..32b830dd883d0b346728e0bcea97e4afd444b103 100644 (file)
--- a/info.c
+++ b/info.c
@@ -11,7 +11,6 @@ static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locatio
 static GtkEntry *location;
 static GtkTextBuffer *notes;
 static int location_changed = 1, notes_changed = 1;
-static struct dive *buffered_dive;
 
 static const char *weekday(int wday)
 {
@@ -31,10 +30,8 @@ static char *get_text(GtkTextBuffer *buffer)
        return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
 }
 
-void flush_dive_info_changes(void)
+void flush_dive_info_changes(struct dive *dive)
 {
-       struct dive *dive = buffered_dive;
-
        if (!dive)
                return;
 
@@ -49,14 +46,12 @@ void flush_dive_info_changes(void)
        }
 }
 
-void update_dive_info(struct dive *dive)
+void show_dive_info(struct dive *dive)
 {
        struct tm *tm;
        char buffer[80];
        char *text;
-
-       flush_dive_info_changes();
-       buffered_dive = dive;
+       int len;
 
        if (!dive) {
                gtk_label_set_text(GTK_LABEL(divedate), "no dive");
@@ -121,7 +116,12 @@ void update_dive_info(struct dive *dive)
 
        text = dive->location ? : "";
        gtk_entry_set_text(location, text);
-       gtk_label_set_text(GTK_LABEL(locationnote), text);
+
+       len = 0;
+       if (dive->nr)
+               len = snprintf(buffer, sizeof(buffer), "%d. ", dive->nr);
+       snprintf(buffer+len, sizeof(buffer)-len, "%s", text);
+       gtk_label_set_text(GTK_LABEL(locationnote), buffer);
 
        text = dive->notes ? : "";
        gtk_text_buffer_set_text(notes, text, -1);
@@ -217,6 +217,6 @@ GtkWidget *extended_dive_info_widget(void)
        notes = text_view(vbox, "Notes", TRUE);
 
        /* Add extended info here: name, description, yadda yadda */
-       update_dive_info(current_dive);
+       show_dive_info(current_dive);
        return vbox;
 }