From 695b7c43be6f80b4338bbc72292f8ac7f8803f06 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 28 Aug 2019 15:34:48 +1000 Subject: [PATCH] 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 --- tuhi/dbusclient.py | 8 ++++---- tuhi/gui/window.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tuhi/dbusclient.py b/tuhi/dbusclient.py index 7260ac4..762d08a 100644 --- a/tuhi/dbusclient.py +++ b/tuhi/dbusclient.py @@ -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: diff --git a/tuhi/gui/window.py b/tuhi/gui/window.py index 8805a80..129c4a6 100644 --- a/tuhi/gui/window.py +++ b/tuhi/gui/window.py @@ -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)