Merging upstream version 2.3~rc2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
fb45a5d8b7
commit
91f6ff82fe
6 changed files with 296 additions and 95 deletions
|
@ -169,9 +169,9 @@ class Controller(stas.ControllerABC): # pylint: disable=too-many-instance-attri
|
|||
self._udev.unregister_for_device_events(self._on_udev_notification)
|
||||
self._kill_ops() # Kill all pending operations
|
||||
self._ctrl = None
|
||||
|
||||
# Defer removal of this object to the next main loop's idle period.
|
||||
GLib.idle_add(self._serv.remove_controller, self, True)
|
||||
self._device = None
|
||||
self._connect_attempts = 0
|
||||
self._retry_connect_tmr.start()
|
||||
|
||||
def _get_cfg(self):
|
||||
'''Get configuration parameters. These may either come from the [Global]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue