Merge branch 'master' into customizable_user_sounds

20 files changed, 42 insertions, 42 deletions

diff --git a/src/audio/main.vala b/src/audio/main.vala
index ac80c75..ac64f52 100644
--- a/src/audio/main.vala
+++ b/src/audio/main.vala
@@ -19,7 +19,7 @@ public static int main(string[] args) {
 	Gst.init(ref args);
 
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.AudioPlayer",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
@@ -27,7 +27,7 @@ public static int main(string[] args) {
 		() => stderr.printf("Could not aquire name\n"));
 
 	try {
-		Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		var path = cfg.get_string("AUDIO", "path");
 		player = new AudioPlayerImplementation(path);
 	} catch(IOError e) {
diff --git a/src/backup/main.vala b/src/backup/main.vala
index 00ff623..4aed71f 100644
--- a/src/backup/main.vala
+++ b/src/backup/main.vala
@@ -15,12 +15,12 @@
 
 public static int main(string[] args) {
 	try {
-		Mailer mailer = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", "/io/mainframe/shopsystem/mailer");
-		Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		Mailer mailer = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Mail", "/io/mainframe/shopsystem/mailer");
+		Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		string dbfile = cfg.get_string("DATABASE", "file");
 
 		string mailpath = mailer.create_mail();
-		Mail mail = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", mailpath);
+		Mail mail = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Mail", mailpath);
 
 		uint8[] dbdata;
 		FileUtils.get_data(dbfile, out dbdata);
diff --git a/src/cli/main.vala b/src/cli/main.vala
index a85cbc7..a3208dd 100644
--- a/src/cli/main.vala
+++ b/src/cli/main.vala
@@ -26,7 +26,7 @@ public static int main(string[] args) {
 	
 	cli = new CliImpl();
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.Cli",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/config/main.vala b/src/config/main.vala
index 566730b..5ae15be 100644
--- a/src/config/main.vala
+++ b/src/config/main.vala
@@ -21,7 +21,7 @@ public static int main(string[] args) {
 	cfg = new Cfg(binarylocation + "/../../ktt-shopsystem.cfg");
 
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.Config",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/curses-ui/main.vala b/src/curses-ui/main.vala
index 993848c..da822a9 100644
--- a/src/curses-ui/main.vala
+++ b/src/curses-ui/main.vala
@@ -47,8 +47,8 @@ public static int main(string[] args) {
 	Unix.signal_add(Posix.SIGINT,  handle_signals);
 
 	try {
-		audio = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio");
-		scanner = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.ScannerSession", "/io/mainframe/shopsystem/scanner_session");
+		audio = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio");
+		scanner = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.ScannerSession", "/io/mainframe/shopsystem/scanner_session");
 	} catch(IOError e) {
 		error("IOError: %s\n", e.message);
 	}
diff --git a/src/database/main.vala b/src/database/main.vala
index 1de94b8..72e3813 100644
--- a/src/database/main.vala
+++ b/src/database/main.vala
@@ -21,7 +21,7 @@ DataBase db;
 
 public static int main(string[] args) {
 	try {
-		Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		var dbfile = cfg.get_string("DATABASE", "file");
 		db = new DataBase(dbfile);
 	} catch(IOError e) {
@@ -31,7 +31,7 @@ public static int main(string[] args) {
 	}
 
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.Database",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/input-device/main.vala b/src/input-device/main.vala
index e2dee27..8578033 100644
--- a/src/input-device/main.vala
+++ b/src/input-device/main.vala
@@ -17,7 +17,7 @@ Device dev;
 
 public static int main(string[] args) {
 	try {
-		Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		dev = new Device(cfg.get_string("INPUT", "device"));
 	} catch(IOError e) {
 		error("IOError: %s\n", e.message);
@@ -26,7 +26,7 @@ public static int main(string[] args) {
 	}
 
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.InputDevice",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/invoice/invoice.vala b/src/invoice/invoice.vala
index 9f501d7..443b4c2 100644
--- a/src/invoice/invoice.vala
+++ b/src/invoice/invoice.vala
@@ -34,10 +34,10 @@ public class InvoiceImplementation {
 	string datadir;
 
 	public InvoiceImplementation() throws IOError, KeyFileError {
-		mailer = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", "/io/mainframe/shopsystem/mailer");
-		db = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database");
-		pdf = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf");
-		Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		mailer = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Mail", "/io/mainframe/shopsystem/mailer");
+		db = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database");
+		pdf = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf");
+		Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		datadir = cfg.get_string("INVOICE", "datadir");
 	}
 
@@ -66,7 +66,7 @@ public class InvoiceImplementation {
 		var users = db.get_users_with_sales(ts.from, ts.to);
 
 		string treasurer_path  = mailer.create_mail();
-		Mail treasurer_mail    = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", treasurer_path);
+		Mail treasurer_mail    = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Mail", treasurer_path);
 		treasurer_mail.from    = {"KtT Shopsystem", "shop@kreativitaet-trifft-technik.de"};
 		treasurer_mail.subject = mailtitle;
 		treasurer_mail.add_recipient({"Schatzmeister", "shop-einzug@kreativitaet-trifft-technik.de"}, RecipientType.TO);
@@ -81,7 +81,7 @@ public class InvoiceImplementation {
 			if(userid == user) {
 				var invoicedata = generate_invoice(temporary, timestamp, userid, invoiceid);
 				string mail_path = mailer.create_mail();
-				Mail mail = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", mail_path);
+				Mail mail = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Mail", mail_path);
 				mail.from = {"KtT Shopsystem", "shop@kreativitaet-trifft-technik.de"};
 				mail.subject = mailtitle;
 				mail.add_recipient({@"$(userdata.firstname) $(userdata.lastname)", userdata.email}, RecipientType.TO);
@@ -134,7 +134,7 @@ public class InvoiceImplementation {
 		var users = db.get_users_with_sales(ts.from, ts.to);
 
 		string treasurer_path  = mailer.create_mail();
-		Mail treasurer_mail    = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", treasurer_path);
+		Mail treasurer_mail    = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Mail", treasurer_path);
 		treasurer_mail.from    = {"KtT Shopsystem", "shop@kreativitaet-trifft-technik.de"};
 		treasurer_mail.subject = mailtitle;
 		treasurer_mail.add_recipient({"Schatzmeister", "shop-einzug@kreativitaet-trifft-technik.de"}, RecipientType.TO);
@@ -148,7 +148,7 @@ public class InvoiceImplementation {
 			var total_sum = db.get_user_invoice_sum(userid, tst.from, tst.to);
 
 			string mail_path = mailer.create_mail();
-			Mail mail = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", mail_path);
+			Mail mail = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Mail", mail_path);
 			mail.from = {"KtT Shopsystem", "shop@kreativitaet-trifft-technik.de"};
 			mail.subject = mailtitle;
 			mail.add_recipient({@"$(userdata.firstname) $(userdata.lastname)", userdata.email}, RecipientType.TO);
diff --git a/src/mail/mailer.vala b/src/mail/mailer.vala
index 4888fe7..3ec9381 100644
--- a/src/mail/mailer.vala
+++ b/src/mail/mailer.vala
@@ -70,7 +70,7 @@ public class MailerImplementation {
 		Posix.signal(Posix.SIGPIPE, Posix.SIG_IGN);
 
 		/* get configuration */
-		Config config = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		Config config = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		try {
 			var cfgserv = config.get_string("MAIL", "server");
 			var cfgport	= config.get_integer("MAIL", "port");
diff --git a/src/mail/main.vala b/src/mail/main.vala
index 1aeb3eb..0c36f6b 100644
--- a/src/mail/main.vala
+++ b/src/mail/main.vala
@@ -24,7 +24,7 @@ public static int main(string[] args) {
 	}
 
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.Mail",
 		BusNameOwnerFlags.NONE,
 		on_mail_bus_aquired,
diff --git a/src/pdf-invoice/main.vala b/src/pdf-invoice/main.vala
index cbb73f2..3d8e298 100644
--- a/src/pdf-invoice/main.vala
+++ b/src/pdf-invoice/main.vala
@@ -17,7 +17,7 @@ private string datadir;
 
 public static int main(string[] args) {
 	try {
-		Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		datadir = cfg.get_string("INVOICE", "datadir");
 	} catch(IOError e) {
 		error("IOError: %s\n", e.message);
@@ -26,7 +26,7 @@ public static int main(string[] args) {
 	}
 
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.InvoicePDF",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/pdf-invoice/test.vala b/src/pdf-invoice/test.vala
index 0ca02fd..e55f3a3 100644
--- a/src/pdf-invoice/test.vala
+++ b/src/pdf-invoice/test.vala
@@ -14,7 +14,7 @@
  */
 
 public static int main(string args[]) {
-	PDFInvoice invoice = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf");
+	PDFInvoice invoice = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf");
 
 	InvoiceRecipient r = {
 		"Max",
diff --git a/src/pdf-stock/main.vala b/src/pdf-stock/main.vala
index fee62af..49613f4 100644
--- a/src/pdf-stock/main.vala
+++ b/src/pdf-stock/main.vala
@@ -15,7 +15,7 @@
 
 public static int main(string[] args) {
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.StockPDF",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/pdf-stock/pdf-stock.vala b/src/pdf-stock/pdf-stock.vala
index c1e9b6a..e971f78 100644
--- a/src/pdf-stock/pdf-stock.vala
+++ b/src/pdf-stock/pdf-stock.vala
@@ -169,7 +169,7 @@ public class StockPDF {
 
 		/* get stock */
 		try {
-			Database db = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database");
+			Database db = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database");
 			stock = db.get_stock();
 			timestamp = new DateTime.now_local().to_unix();
 		} catch(IOError e) {
diff --git a/src/pdf-stock/test.vala b/src/pdf-stock/test.vala
index 9cd3a7e..cc3da4f 100644
--- a/src/pdf-stock/test.vala
+++ b/src/pdf-stock/test.vala
@@ -15,7 +15,7 @@
 
 public static int main(string args[]) {
 	try {
-		PDFStock stock = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.StockPDF", "/io/mainframe/shopsystem/stockpdf");
+		PDFStock stock = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.StockPDF", "/io/mainframe/shopsystem/stockpdf");
 		var pdfdata = stock.generate();
 		FileUtils.set_contents("test.pdf", (string) pdfdata, pdfdata.length);
 	} catch(IOError e) {
diff --git a/src/pgp/main.vala b/src/pgp/main.vala
index f95b6f7..c866c7b 100644
--- a/src/pgp/main.vala
+++ b/src/pgp/main.vala
@@ -22,7 +22,7 @@ Config cfg;
 
 public static int main(string[] args) {
 	try {
-		cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		pgp = new PGPKeyArchive(cfg.get_string("PGP", "keyring"));
 	} catch(IOError e) {
 		error("IOError: %s\n", e.message);
@@ -32,7 +32,7 @@ public static int main(string[] args) {
 
 
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.PGP",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/scanner-session/main.vala b/src/scanner-session/main.vala
index 6de4f99..2ed94f9 100644
--- a/src/scanner-session/main.vala
+++ b/src/scanner-session/main.vala
@@ -17,7 +17,7 @@ ScannerSessionImplementation session;
 
 public static int main(string[] args) {
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.ScannerSession",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/scanner-session/scannersession.vala b/src/scanner-session/scannersession.vala
index 37b4ad4..cbce9d3 100644
--- a/src/scanner-session/scannersession.vala
+++ b/src/scanner-session/scannersession.vala
@@ -32,10 +32,10 @@ public class ScannerSessionImplementation {
 
   public ScannerSessionImplementation() {
     try {
-      db       = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database");
-      dev      = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.InputDevice", "/io/mainframe/shopsystem/device");
-      cli      = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Cli", "/io/mainframe/shopsystem/cli");
-      audio    = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio");
+      db       = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database");
+      dev      = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.InputDevice", "/io/mainframe/shopsystem/device");
+      cli      = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Cli", "/io/mainframe/shopsystem/cli");
+      audio    = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio");
 
       dev.received_barcode.connect(handle_barcode);
       cli.received_barcode.connect(handle_barcode);
diff --git a/src/serial-device/main.vala b/src/serial-device/main.vala
index ae1aa75..0dea907 100644
--- a/src/serial-device/main.vala
+++ b/src/serial-device/main.vala
@@ -17,7 +17,7 @@ Device dev;
 
 public static int main(string[] args) {
 	try {
-		Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+		Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
 		dev = new Device(cfg.get_string("INPUT", "device"), 9600, 8, 1);
 	} catch(IOError e) {
 		error("IOError: %s\n", e.message);
@@ -26,7 +26,7 @@ public static int main(string[] args) {
 	}
 
 	Bus.own_name(
-		BusType.SESSION,
+		BusType.SYSTEM,
 		"io.mainframe.shopsystem.InputDevice",
 		BusNameOwnerFlags.NONE,
 		on_bus_aquired,
diff --git a/src/web/main.vala b/src/web/main.vala
index 22c586b..7070e66 100644
--- a/src/web/main.vala
+++ b/src/web/main.vala
@@ -27,10 +27,10 @@ public static int main(string[] args) {
 	uint port = 8080;
 
 	try {
-		db  	= Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database");
-		pgp 	= Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.PGP", "/io/mainframe/shopsystem/pgp");
-		cfg 	= Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
-		audio	= Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio");
+		db  = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database");
+		pgp = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.PGP", "/io/mainframe/shopsystem/pgp");
+		cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+    audio	= Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio");
 		templatedir = cfg.get_string("WEB", "filepath");
 		port = cfg.get_integer("WEB", "port");