Skip to content

Some fixes for BluezAgent for older legacy keyboards #3254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
infirit wants to merge 3 commits into
base: main
Choose a base branch
from
+9 −6
Draft

Some fixes for BluezAgent for older legacy keyboards #3254

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7ff744
BluezAgent: Also check for Bonded when removing
infirit May 17, 2026
ba674b7
BluezAgent: Don't connect a signal every time in _on_display_passkey
infirit May 17, 2026
447102b
BluezAgent: Do not recreate notification in _on_display_passkey
infirit May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions blueman/main/applet/BluezAgent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def passkey_dialog_cb(dialog: Gtk.Dialog, response_id: int) -> None:

# Workaround BlueZ not calling the Cancel method, see #164
def _on_device_property_changed(self, device: Device, key: str, value: Any, path: str) -> None:
if (key == "Paired" and value) or (key == "Connected" and not value):
if (key in ("Paired", "Bonded") and value) or (key == "Connected" and not value):
handlerid = self._devhandlerids.pop(path)
device.disconnect_signal(handlerid)
self._on_cancel()
Expand Down Expand Up @@ -195,15 +195,18 @@ def _on_request_passkey(self, object_path: ObjectPath, ok: Callable[[int], None]

def _on_display_passkey(self, object_path: ObjectPath, passkey: int, entered: int) -> None:
logging.info(f"DisplayPasskey ({object_path}, {passkey:d} {entered:d})")
dev = Device(obj_path=object_path)
self._devhandlerids[object_path] = dev.connect_signal("property-changed", self._on_device_property_changed)
if object_path not in self._devhandlerids:
dev = Device(obj_path=object_path)
self._devhandlerids[object_path] = dev.connect_signal("property-changed", self._on_device_property_changed)

key = f"{passkey:06}"
notify_message = _("Pairing passkey for") + f" {self.get_device_string(object_path)}: " \
f"{key[:entered]}<b>{key[entered]}</b>{key[entered + 1:]}"
self._close()
self._notification = Notification("Bluetooth", notify_message, 0, icon_name="blueman")
self._notification.show()
if self._notification is None:
self._notification = Notification("Bluetooth", notify_message, 0, icon_name="blueman")
self._notification.show()
else:
self._notification.set_message(notify_message)

def _on_display_pin_code(self, object_path: ObjectPath, pin_code: str) -> None:
logging.info(f'DisplayPinCode ({object_path}, {pin_code})')
Expand Down
Loading