Skip to content

Reconnect ObjectManager #3282

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
cschramm wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −8
Draft

Reconnect ObjectManager #3282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions blueman/bluez/Manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,7 @@ class Manager(GObject.GObject, metaclass=SingletonGObjectMeta):

def __init__(self) -> None:
super().__init__()
self._object_manager = Gio.DBusObjectManagerClient.new_for_bus_sync(
Gio.BusType.SYSTEM, Gio.DBusObjectManagerClientFlags.DO_NOT_AUTO_START,
self.__bus_name, '/', None, None, None)

self._object_manager.connect("object-added", self._on_object_added)
self._object_manager.connect("object-removed", self._on_object_removed)
self._object_manager.connect("interface-added", self._on_interface_added)
self._object_manager.connect("interface-removed", self._on_interface_removed)
self.reconnect()

def _on_object_added(self, _object_manager: Gio.DBusObjectManager, dbus_object: Gio.DBusObject) -> None:
device_proxy = dbus_object.get_interface('org.bluez.Device1')
Expand Down Expand Up @@ -163,6 +156,15 @@ def find_device(self, address: BtAddress, adapter_path: ObjectPath = ObjectPath(
return device
return None

def reconnect(self) -> None:
self._object_manager = Gio.DBusObjectManagerClient.new_for_bus_sync(
Gio.BusType.SYSTEM, Gio.DBusObjectManagerClientFlags.DO_NOT_AUTO_START,
self.__bus_name, '/', None, None, None)
self._object_manager.connect("object-added", self._on_object_added)
self._object_manager.connect("object-removed", self._on_object_removed)
self._object_manager.connect("interface-added", self._on_interface_added)
self._object_manager.connect("interface-removed", self._on_interface_removed)

def destroy(self) -> None:
if self._object_manager:
del self._object_manager
Expand Down
1 change: 1 addition & 0 deletions blueman/main/Applet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def _on_dbus_name_appeared(self, _connection: Gio.DBusConnection, name: str, own
logging.info(f"{name} {owner}")
self.manager_state = True
self.plugin_run_state_changed = True
self.Manager.reconnect()
for plugin in self.Plugins.get_loaded_plugins(AppletPlugin):
plugin.on_manager_state_changed(self.manager_state)

Expand Down