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

dbusclient: drop the duplicate device argument 

The first argument in any signal is the object that emits it, so we don't have
to add it again.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-08-28 15:34:48 +10:00 committed by Benjamin Tissoires
parent 71ca2ca569
commit 695b7c43be
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tuhi/dbusclient.py
View File

@ -152,9 +152,9 @@ class BlueZDevice(_DBusSystemObject):
class TuhiDBusClientDevice(_DBusObject):
__gsignals__ = {
'button-press-required':
(GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
(GObject.SignalFlags.RUN_FIRST, None, ()),
'registered':
(GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
(GObject.SignalFlags.RUN_FIRST, None, ()),
'device-error':
(GObject.SignalFlags.RUN_FIRST, None, (int,)),
}
@ -239,7 +239,7 @@ class TuhiDBusClientDevice(_DBusObject):
def _on_signal_received(self, proxy, sender, signal, parameters):
if signal == 'ButtonPressRequired':
logger.info(f'{self}: Press button on device now')
self.emit('button-press-required', self)
self.emit('button-press-required')
elif signal == 'ListeningStopped':
err = parameters[0]
if err == -errno.EACCES:
@ -280,7 +280,7 @@ class TuhiDBusClientDevice(_DBusObject):
self.manager.disconnect(self.s1)
del(self.s1)
logger.info(f'{self}: Registration successful')
self.emit('registered', self)
self.emit('registered')
def terminate(self):
try:

4
tuhi/gui/window.py
View File

@ -100,13 +100,13 @@ class SetupDialog(Gtk.Dialog):
self._sig = device.connect('button-press-required', self._on_button_press_required)
device.register()
def _on_button_press_required(self, tuhi, device):
def _on_button_press_required(self, device):
device.disconnect(self._sig)
self.stack.set_visible_child_name('page2')
self._sig = device.connect('registered', self._on_registered)
def _on_registered(self, tuhi, device):
def _on_registered(self, device):
device.disconnect(self._sig)
self.device = device
self.response(Gtk.ResponseType.OK)