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/scanner-session | |
parent | f891ecc9fbe159ec8a6cf321c43217d59f8cdf02 (diff) | |
parent | 529d6dd34f9209efef18c04121075be9ac310c9c (diff) | |
download | serial-barcode-scanner-cee8d7e8684ec03240e95f8443e4f5cbc04bec5a.tar.bz2 |
Merge branch 'master' into customizable_user_sounds
Diffstat (limited to 'src/scanner-session')
-rw-r--r-- | src/scanner-session/main.vala | 2 | ||||
-rw-r--r-- | src/scanner-session/scannersession.vala | 8 |
2 files changed, 5 insertions, 5 deletions
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); |