diff options
| author | Sebastian Reichel <sre@ring0.de> | 2017-04-18 22:13:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-18 22:13:12 +0200 |
| commit | cee8d7e8684ec03240e95f8443e4f5cbc04bec5a (patch) | |
| tree | 665b0df5b26f55cf845723a4b1629937ed1fa422 /src/web | |
| parent | f891ecc9fbe159ec8a6cf321c43217d59f8cdf02 (diff) | |
| parent | 529d6dd34f9209efef18c04121075be9ac310c9c (diff) | |
| download | serial-barcode-scanner-cee8d7e8684ec03240e95f8443e4f5cbc04bec5a.tar.bz2 | |
Merge branch 'master' into customizable_user_sounds
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/main.vala | 8 |
1 files changed, 4 insertions, 4 deletions
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"); |