emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/bluetooth ada89f2faa 10/32: clean up the signal handler


From: Stefan Kangas
Subject: [elpa] externals/bluetooth ada89f2faa 10/32: clean up the signal handler function
Date: Mon, 3 Jan 2022 15:11:07 -0500 (EST)

branch: externals/bluetooth
commit ada89f2faa99980bfdf7436c209cdc26bbf49e54
Author: Raffael Stocker <r.stocker@mnet-mail.de>
Commit: Raffael Stocker <r.stocker@mnet-mail.de>

    clean up the signal handler function
---
 bluetooth.el | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/bluetooth.el b/bluetooth.el
index 1d3f0bb402..081751558c 100644
--- a/bluetooth.el
+++ b/bluetooth.el
@@ -596,21 +596,18 @@ update the status display accordingly."
 
 This function registers a signal handler only for the first
 adapter reported by Bluez."
-  (let ((adapters (dbus-introspect-get-node-names bluetooth-bluez-bus
-                                                                               
                  bluetooth--service
-                                                                               
                  bluetooth--root)))
-       (setq bluetooth--adapter-signal
-                 (dbus-register-signal bluetooth-bluez-bus
-                                                               nil
-                                                               (concat 
bluetooth--root "/"
-                                                                               
(car adapters))
-                                                               (alist-get 
:properties
-                                                                               
   bluetooth--interfaces)
-                                                               
"PropertiesChanged"
-                                                               
#'bluetooth--handle-prop-change
-                                                               :arg-namespace
-                                                               (alist-get 
:adapter
-                                                                               
   bluetooth--interfaces)))))
+  (let ((adapter (cl-first (bluetooth--adapters))))
+       (dbus-register-signal bluetooth-bluez-bus
+                                                 nil
+                                                 (concat bluetooth--root "/"
+                                                                 adapter)
+                                                 (alist-get :properties
+                                                                        
bluetooth--interfaces)
+                                                 "PropertiesChanged"
+                                                 
#'bluetooth--handle-prop-change
+                                                 :arg-namespace
+                                                 (alist-get :adapter
+                                                                        
bluetooth--interfaces))))
 
 (defun bluetooth--device-uuids (properties)
   "Extract a UUID alist from device PROPERTIES.
@@ -651,7 +648,8 @@ scanning the bus, displaying device info etc."
          (add-hook 'kill-buffer-hook #'bluetooth--cleanup nil t)
          (setq imenu-create-index-function #'bluetooth--create-imenu-index)
          (bluetooth--initialize-mode-info)
-         (bluetooth--register-signal-handler))))
+         (setq bluetooth--adapter-signal
+                       (bluetooth--register-signal-handler)))))
 
 
 ;;;; Bluetooth pairing agent code



reply via email to

[Prev in Thread] Current Thread [Next in Thread]