[elpa] externals/bluetooth ab3a4c9cc5 18/32: move bluetooth--create-device to the other --device functions

[Stefan Kangas]

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

    move bluetooth--create-device to the other --device functions
---
 bluetooth.el | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/bluetooth.el b/bluetooth.el
index 9cdde1ef0a..897c40d1d5 100644
--- a/bluetooth.el
+++ b/bluetooth.el
@@ -390,7 +390,18 @@ properties."
                  ((null value) "no")
                  (t "yes"))))
 
-;; TODO extend to multiple adapters
+(defun bluetooth--create-device (adapter dev-id)
+  "Create a bluetooth device struct for DEV-ID on ADAPTER."
+  (let* ((path (mapconcat #'identity
+                                                 (list bluetooth--root adapter 
dev-id)
+                                                 "/"))
+                (props (dbus-get-all-properties bluetooth-bluez-bus
+                                                                               
 bluetooth--service
+                                                                               
 path
+                                                                               
 (alist-get
+                                                                               
  :device bluetooth--interfaces))))
+       (make-bluetooth-device :id dev-id :properties props)))
+
 (defun bluetooth--adapter-properties (adapter)
   "Return the properties of bluetooth ADAPTER.
 This function evaluates to an alist of attribute/value pairs."
@@ -407,18 +418,6 @@ This function evaluates to an alist of attribute/value 
pairs."
 NOTE: the strings MUST correspond to Bluez device properties
 as they are used to gather the information from Bluez.")
 
-(defun bluetooth--create-device (adapter dev-id)
-  "Create a bluetooth device struct for DEV-ID on ADAPTER."
-  (let* ((path (mapconcat #'identity
-                                                 (list bluetooth--root adapter 
dev-id)
-                                                 "/"))
-                (props (dbus-get-all-properties bluetooth-bluez-bus
-                                                                               
 bluetooth--service
-                                                                               
 path
-                                                                               
 (alist-get
-                                                                               
  :device bluetooth--interfaces))))
-       (make-bluetooth-device :id dev-id :properties props)))
-
 (defun bluetooth--update-device-info ()
   "Update the bluetooth devices list."
   (mapc (lambda (adapter)