From c685dcdc8778aa640cff9f4b5c46161453abf8a7 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@ring0.de>
Date: Sun, 28 Apr 2013 21:42:40 +0200
Subject: put database location into config file

---
 src/database/Makefile  |  2 +-
 src/database/main.vala | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/database')

diff --git a/src/database/Makefile b/src/database/Makefile
index bba9e0a..b050bca 100644
--- a/src/database/Makefile
+++ b/src/database/Makefile
@@ -1,6 +1,6 @@
 all: database
 
-database: main.vala database.vala db-interface.vala ../price.vapi
+database: main.vala database.vala db-interface.vala ../config/config-interface.vala ../price.vapi
 	valac -o $@ --pkg sqlite3 --pkg gee-1.0 --pkg gio-2.0 $^
 
 clean:
diff --git a/src/database/main.vala b/src/database/main.vala
index 676e960..1de94b8 100644
--- a/src/database/main.vala
+++ b/src/database/main.vala
@@ -20,7 +20,15 @@ public static void write_to_log(string message, ...) {
 DataBase db;
 
 public static int main(string[] args) {
-	db = new DataBase("../../shop.db");
+	try {
+		Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		var dbfile = cfg.get_string("DATABASE", "file");
+		db = new DataBase(dbfile);
+	} catch(IOError e) {
+		error("IOError: %s\n", e.message);
+	} catch(KeyFileError e) {
+		error("Config Error: %s\n", e.message);
+	}
 
 	Bus.own_name(
 		BusType.SESSION,
-- 
cgit v1.2.3