Skip to content

Commit b1633b8

Browse files
committed
bluez.Manager: Do not handle Battery1 when removing objects
We do need to send a battery-created signal when blueman is dealing with existing batteries. But in my testing we always see an interface-removed signal from BlueZ. Fixes #3233
1 parent 9a6144e commit b1633b8

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

blueman/bluez/Manager.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ def _on_object_added(self, _object_manager: Gio.DBusObjectManager, dbus_object:
6060
def _on_object_removed(self, _object_manager: Gio.DBusObjectManager, dbus_object: Gio.DBusObject) -> None:
6161
device_proxy = dbus_object.get_interface('org.bluez.Device1')
6262
adapter_proxy = dbus_object.get_interface('org.bluez.Adapter1')
63-
battery_proxy = dbus_object.get_interface('org.bluez.Battery1')
6463

6564
if adapter_proxy:
6665
assert isinstance(adapter_proxy, Gio.DBusProxy)
@@ -72,11 +71,6 @@ def _on_object_removed(self, _object_manager: Gio.DBusObjectManager, dbus_object
7271
object_path = device_proxy.get_object_path()
7372
logging.debug(object_path)
7473
self.emit('device-removed', object_path)
75-
if battery_proxy:
76-
assert isinstance(device_proxy, Gio.DBusProxy)
77-
object_path = device_proxy.get_object_path()
78-
logging.debug(object_path)
79-
self.emit('battery-removed', object_path)
8074

8175
def _on_interface_added(self, _object_manager: Gio.DBusObjectManager, dbus_object: Gio.DBusObject,
8276
_dbus_interface: Gio.DBusInterface) -> None:

0 commit comments

Comments
 (0)