nixo
/
tuhi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbus: use self.objpath instead of the hardcoded BASE_PATH in the manager

This commit is contained in:
Peter Hutterer 2018-01-24 19:41:13 +10:00
parent fc8f0f6716
commit 1a6071b93d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tuhi/dbusserver.py
View File

@ -367,14 +367,14 @@ class TuhiDBusServer(GObject.Object):
def _bus_aquired(self, connection, name): def _bus_aquired(self, connection, name):
introspection = Gio.DBusNodeInfo.new_for_xml(INTROSPECTION_XML) introspection = Gio.DBusNodeInfo.new_for_xml(INTROSPECTION_XML)
intf = introspection.lookup_interface(INTF_MANAGER) intf = introspection.lookup_interface(INTF_MANAGER)
self.objpath = BASE_PATH
Gio.DBusConnection.register_object(connection, Gio.DBusConnection.register_object(connection,
BASE_PATH, self.objpath,
intf, intf,
self._method_cb, self._method_cb,
self._property_read_cb, self._property_read_cb,
self._property_write_cb) self._property_write_cb)
self._connection = connection self._connection = connection
self.objpath = BASE_PATH
def _bus_name_aquired(self, connection, name): def _bus_name_aquired(self, connection, name):
logger.debug('Bus name aquired') logger.debug('Bus name aquired')
@ -465,7 +465,7 @@ class TuhiDBusServer(GObject.Object):
status = GLib.Variant.new_int32(status) status = GLib.Variant.new_int32(status)
status = GLib.Variant.new_tuple(status) status = GLib.Variant.new_tuple(status)
self._connection.emit_signal(self._searching_client[0], self._connection.emit_signal(self._searching_client[0],
BASE_PATH, INTF_MANAGER, self.object_path, INTF_MANAGER,
"SearchStopped", status) "SearchStopped", status)
self._searching_client = None self._searching_client = None
@ -500,7 +500,7 @@ class TuhiDBusServer(GObject.Object):
inval_props = GLib.VariantBuilder(GLib.VariantType('as')) inval_props = GLib.VariantBuilder(GLib.VariantType('as'))
inval_props = inval_props.end() inval_props = inval_props.end()
self._connection.emit_signal(None, BASE_PATH, self._connection.emit_signal(None, self.objpath,
"org.freedesktop.DBus.Properties", "org.freedesktop.DBus.Properties",
"PropertiesChanged", "PropertiesChanged",
GLib.Variant.new_tuple( GLib.Variant.new_tuple(
@ -511,6 +511,6 @@ class TuhiDBusServer(GObject.Object):
def _emit_pairable_signal(self, device): def _emit_pairable_signal(self, device):
arg = GLib.Variant.new_object_path(device.objpath) arg = GLib.Variant.new_object_path(device.objpath)
self._connection.emit_signal(self._searching_client[0], self._connection.emit_signal(self._searching_client[0],
BASE_PATH, INTF_MANAGER, self.objpath, INTF_MANAGER,
"PairableDevice", "PairableDevice",
GLib.Variant.new_tuple(arg)) GLib.Variant.new_tuple(arg))