From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Sep 2011 16:58:34 +0000 (-0700)
Subject: Merge branch 'fix-entries' of https://github.com/nathansamson/diveclog
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=9dc88381d2ac893fe618221269c98779bdb72688;hp=14547d8ca26fb91b145c6051e541863fb89b76b5;p=ext%2Fsubsurface.git

Merge branch 'fix-entries' of https://github.com/nathansamson/diveclog

* 'fix-entries' of https://github.com/nathansamson/diveclog:
  Word wrap the info textview. Also do not show the scrollbars if not necessary.
  Change location to a text entry instead of text view.
---

diff --git a/.gitignore b/.gitignore
index 295ea6b..aeb949b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 *.o
-/parse
+/divelog
diff --git a/save-xml.c b/save-xml.c
index 9e3640c..5c05723 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -193,4 +193,5 @@ void save_dives(const char *filename)
 	for (i = 0; i < dive_table.nr; i++)
 		save_dive(f, get_dive(i));
 	fprintf(f, "</dives>\n");
+	fclose(f);
 }