From 26d9a55ce88dfaeb4507c1a7f85cada6debba9f1 Mon Sep 17 00:00:00 2001 From: Hank Greenburg Date: Sun, 29 Dec 2024 20:09:14 -0800 Subject: [PATCH 1/3] fix: revert ui.py to pydbus --- pantalaimon/ui.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pantalaimon/ui.py b/pantalaimon/ui.py index 08e7e50..813b67e 100644 --- a/pantalaimon/ui.py +++ b/pantalaimon/ui.py @@ -17,7 +17,7 @@ from importlib import util UI_ENABLED = ( util.find_spec("gi") is not None and util.find_spec("gi.repository") is not None - and util.find_spec("dasbus") is not None + and util.find_spec("pydbus") is not None ) if UI_ENABLED: @@ -28,8 +28,8 @@ if UI_ENABLED: import dbus import notify2 from gi.repository import GLib - from dasbus import SessionMessageBus - from dasbus.signal import Signal + from pydbus import SessionBus + from pydbus.generic import signal from dbus.mainloop.glib import DBusGMainLoop from nio import RoomKeyRequest, RoomKeyRequestCancellation @@ -123,8 +123,8 @@ if UI_ENABLED: """ - Response = Signal() - UnverifiedDevices = Signal() + Response = signal() + UnverifiedDevices = signal() def __init__(self, queue, server_list, id_counter): self.queue = queue @@ -297,13 +297,13 @@ if UI_ENABLED: """ - VerificationInvite = Signal() - VerificationCancel = Signal() - VerificationString = Signal() - VerificationDone = Signal() + VerificationInvite = signal() + VerificationCancel = signal() + VerificationString = signal() + VerificationDone = signal() - KeyRequest = Signal() - KeyRequestCancel = Signal() + KeyRequest = signal() + KeyRequestCancel = signal() def __init__(self, queue, id_counter): self.device_list = dict() @@ -466,8 +466,8 @@ if UI_ENABLED: self.control_if = Control(self.send_queue, self.server_list, id_counter) self.device_if = Devices(self.send_queue, id_counter) - self.bus = SessionMessageBus() - self.bus.publish_object("org.pantalaimon1", self.control_if, self.device_if) + self.bus = SessionBus() + self.bus.publish("org.pantalaimon1", self.control_if, self.device_if) def unverified_notification(self, message): notification = notify2.Notification( From c3ee162802cc08d219860fef8912ea4cef436d9f Mon Sep 17 00:00:00 2001 From: Hank Greenburg Date: Sun, 29 Dec 2024 20:11:25 -0800 Subject: [PATCH 2/3] fix: revert steup.py to use pydbus --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bba80e6..aeb1a6b 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup( "ui": [ "dbus-python >= 1.2, < 1.3", "PyGObject >= 3.46, < 3.50", - "dasbus == 1.7", + "pydbus >= 0.6, < 0.7", "notify2 >= 0.3, < 0.4", ] }, From 0f52d303d48301171a9c39dbd6f86765e2b45aff Mon Sep 17 00:00:00 2001 From: Hank Greenburg Date: Sun, 29 Dec 2024 20:12:44 -0800 Subject: [PATCH 3/3] fix: revert panctl.py to pydbus --- pantalaimon/panctl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pantalaimon/panctl.py b/pantalaimon/panctl.py index a6e6c89..f37ab88 100644 --- a/pantalaimon/panctl.py +++ b/pantalaimon/panctl.py @@ -35,7 +35,7 @@ from prompt_toolkit import HTML, PromptSession, print_formatted_text from prompt_toolkit.completion import Completer, Completion, PathCompleter from prompt_toolkit.document import Document from prompt_toolkit.patch_stdout import patch_stdout -from dasbus.connection import SessionMessageBus +from pydbus import SessionBus PTK2 = ptk_version.startswith("2.") @@ -405,8 +405,8 @@ class PanCtl: commands = list(command_help.keys()) def __attrs_post_init__(self): - self.bus = SessionMessageBus() - self.pan_bus = self.bus.get_connection("org.pantalaimon1") + self.bus = SessionBus() + self.pan_bus = self.bus.get("org.pantalaimon1") self.ctl = self.pan_bus["org.pantalaimon1.control"] self.devices = self.pan_bus["org.pantalaimon1.devices"]