about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2012-07-03 11:40:04 -0500
committerMarco Peereboom <marco@conformal.com>2012-07-03 11:40:12 -0500
commit49f27ea92946086e2b3023f60445bd5a7d55323e (patch)
treede111267abba9fa352e499249d9906b8f5e52e9c
parentadb346b332c57ded6e85acae144d6934ae5dc72e (diff)
downloadxombrero-49f27ea92946086e2b3023f60445bd5a7d55323e.tar.gz
move init of resource_dir into unix specific code
-rw-r--r--unix.c9
-rw-r--r--xombrero.c1
2 files changed, 7 insertions, 3 deletions
diff --git a/unix.c b/unix.c
index a11344b..e7a883e 100644
--- a/unix.c
+++ b/unix.c
@@ -16,5 +16,10 @@
 
 #include <xombrero.h>
 
-/* put this here for now, move away if unix needs something special */
-void	(*os_init)(void);
+void
+init_unix(void)
+{
+	resource_dir = g_strdup("/usr/local/share/xombrero/");
+}
+
+void	(*os_init)(void) = init_unix;
diff --git a/xombrero.c b/xombrero.c
index 56e09c7..674beaf 100644
--- a/xombrero.c
+++ b/xombrero.c
@@ -8265,7 +8265,6 @@ main(int argc, char **argv)
 	/* set default dynamic string settings */
 	home = g_strdup(XT_DS_HOME);
 	search_string = g_strdup(XT_DS_SEARCH_STRING);
-	resource_dir = g_strdup("/usr/local/share/xombrero/");
 	strlcpy(runtime_settings, "runtime", sizeof runtime_settings);
 	cmd_font_name = g_strdup(XT_DS_CMD_FONT_NAME);
 	oops_font_name = g_strdup(XT_DS_OOPS_FONT_NAME);