Merge branch 'defaultfile'

By now the default file code seems quite matured, so in preparation for
2.0 we'll bring it back into master.

I made a few small clean-ups during the merge, but the merge itself is
very much straight forward.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 21 insertions, 0 deletions

diff --git a/linux.c b/linux.c
index 42a3c9f5f..47a00a059 100644
--- a/linux.c
+++ b/linux.c
@@ -1,7 +1,10 @@
 /* linux.c */
 /* implements Linux specific functions */
+#include "dive.h"
 #include "display-gtk.h"
 #include <gconf/gconf-client.h>
+#include <string.h>
+
 #define DIVELIST_DEFAULT_FONT "Sans 8"
 
 GConfClient *gconf;
@@ -63,6 +66,24 @@ const char *subsurface_icon_name()
 	return "subsurface.svg";
 }
 
+const char *subsurface_default_filename()
+{
+	if (default_filename) {
+		return strdup(default_filename);
+	} else {
+		const char *home, *user;
+		char *buffer;
+		int len;
+
+		home = g_get_home_dir();
+		user = g_get_user_name();
+		len = strlen(home) + strlen(user) + 17;
+		buffer = malloc(len);
+		snprintf(buffer, len, "%s/subsurface/%s.xml", home, user);
+		return buffer;
+	}
+}
+
 void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
 		GtkWidget *vbox, GtkUIManager *ui_manager)
 {