From f6cb19145dcdb533505f22ed6b23e4d8494874fe Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Sun, 24 Mar 2013 17:09:08 -0400
Subject: [PATCH] libsaria: Remove app name from init data

I only have one application so there is no point in having a way to
create multiple application directories.

Signed-off-by: Bryan Schumaker <bjschuma@gmail.com>
---
 include/fs.h          | 2 +-
 include/libsaria.h    | 1 -
 libsaria/fs.cpp       | 4 ++--
 libsaria/libsaria.cpp | 2 +-
 newgui/ocarina.cpp    | 1 -
 ocarina/ocarina.cpp   | 1 -
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/fs.h b/include/fs.h
index 0ca2ccc2..92e33991 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -13,7 +13,7 @@ namespace libsaria
 	namespace app
 	{
 
-		void init(const string &);
+		void init();
 
 		void list_dir(const string &, list<string> &);
 		unsigned int read_numdir(const string &, void (*)(ifstream &));
diff --git a/include/libsaria.h b/include/libsaria.h
index 2e3e81f4..e1d46a02 100644
--- a/include/libsaria.h
+++ b/include/libsaria.h
@@ -9,7 +9,6 @@ namespace libsaria
 	struct initdata {
 		int argc;
 		char **argv;
-		string name;
 		void (*on_notify)(notify_t, void *);
 	};
 
diff --git a/libsaria/fs.cpp b/libsaria/fs.cpp
index 1c671ce5..1a7a10fe 100644
--- a/libsaria/fs.cpp
+++ b/libsaria/fs.cpp
@@ -147,10 +147,10 @@ namespace libsaria
 		remove(f.c_str());
 	}
 
-	void app::init(const string &name)
+	void app::init()
 	{
 		string home = getenv("HOME");
-		appdir = home + "/." + name;
+		appdir = home + "/.ocarina";
 	#ifdef DEBUG
 		appdir += "-debug";
 	#endif
diff --git a/libsaria/libsaria.cpp b/libsaria/libsaria.cpp
index 5bf0272c..f7877f52 100644
--- a/libsaria/libsaria.cpp
+++ b/libsaria/libsaria.cpp
@@ -25,7 +25,7 @@ namespace libsaria
 		srand( time(NULL) );
 		println("Initializing libsaria");
 
-		app::init(init->name);
+		app::init();
 		prefs::init();
 
 		audio::init(init->argc, init->argv);
diff --git a/newgui/ocarina.cpp b/newgui/ocarina.cpp
index 5d992ac2..b0d975a6 100644
--- a/newgui/ocarina.cpp
+++ b/newgui/ocarina.cpp
@@ -21,7 +21,6 @@ int main(int argc, char **argv)
 	struct libsaria::initdata ls_init = {
 		argc,
 		argv,
-		"ocarina",
 		on_notify,
 	};
 
diff --git a/ocarina/ocarina.cpp b/ocarina/ocarina.cpp
index 24bd387d..86c74306 100644
--- a/ocarina/ocarina.cpp
+++ b/ocarina/ocarina.cpp
@@ -159,7 +159,6 @@ int main(int argc, char **argv)
 	struct libsaria::initdata ls_init = {
 		argc,
 		argv,
-		"ocarina",	/* app name */
 		on_notify,	/* notification handler */
 	};
 	println("Ocarina " + vers_str());