From e1c1bf6a45da60644b97e2f813b85abb181240b8 Mon Sep 17 00:00:00 2001 From: Sander Sweers Date: Fri, 13 Sep 2024 12:39:41 +0200 Subject: [PATCH] Rfcomm: Change dbus type signature to an int Fixes: #2489 --- blueman/plugins/mechanism/Rfcomm.py | 4 ++-- blueman/services/meta/SerialService.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/blueman/plugins/mechanism/Rfcomm.py b/blueman/plugins/mechanism/Rfcomm.py index 870b58120..b91fa283a 100644 --- a/blueman/plugins/mechanism/Rfcomm.py +++ b/blueman/plugins/mechanism/Rfcomm.py @@ -7,8 +7,8 @@ class Rfcomm(MechanismPlugin): def on_load(self) -> None: - self.parent.add_method("OpenRFCOMM", ("d",), "", self._open_rfcomm) - self.parent.add_method("CloseRFCOMM", ("d",), "", self._close_rfcomm) + self.parent.add_method("OpenRFCOMM", ("n",), "", self._open_rfcomm) + self.parent.add_method("CloseRFCOMM", ("n",), "", self._close_rfcomm) def _open_rfcomm(self, port_id: int) -> None: subprocess.Popen([RFCOMM_WATCHER_PATH, f"/dev/rfcomm{port_id:d}"]) diff --git a/blueman/services/meta/SerialService.py b/blueman/services/meta/SerialService.py index 83fd1960b..a6283398f 100644 --- a/blueman/services/meta/SerialService.py +++ b/blueman/services/meta/SerialService.py @@ -71,7 +71,7 @@ def try_replace_root_watcher(self, monitor: Gio.FileMonitor, path: str, port: in logging.info(f'User was granted access to {path}') logging.info('Replacing root watcher') - Mechanism().CloseRFCOMM('(d)', port) + Mechanism().CloseRFCOMM('(n)', port) subprocess.Popen([RFCOMM_WATCHER_PATH, path]) if port in self._handlerids: handler_id = self._handlerids.pop(port) @@ -101,7 +101,7 @@ def connect( channel) filename = f"/dev/rfcomm{port_id:d}" logging.info('Starting rfcomm watcher as root') - Mechanism().OpenRFCOMM('(d)', port_id) + Mechanism().OpenRFCOMM('(n)', port_id) mon = Gio.File.new_for_path(filename).monitor_file(Gio.FileMonitorFlags.NONE) self._handlerids[port_id] = mon.connect('changed', self.on_file_changed, port_id) self.try_replace_root_watcher(mon, filename, port_id) @@ -122,7 +122,7 @@ def disconnect( error_handler: Optional[Callable[[str], None]] = None ) -> None: try: - Mechanism().CloseRFCOMM('(d)', port_id) + Mechanism().CloseRFCOMM('(n)', port_id) except GLib.Error as e: if error_handler: error_handler(e.message)