From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Sep 2011 18:54:55 +0000 (-0700)
Subject: Show dive number (if it exists) in the location note
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=9580109406f79698b570e917c21b8844f9de34b5

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

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/info.c b/info.c
index 9cb048b..32b830d 100644
--- a/info.c
+++ b/info.c
@@ -51,6 +51,7 @@ void show_dive_info(struct dive *dive)
 	struct tm *tm;
 	char buffer[80];
 	char *text;
+	int len;
 
 	if (!dive) {
 		gtk_label_set_text(GTK_LABEL(divedate), "no dive");
@@ -115,7 +116,12 @@ void show_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);