Commit 5d1cd8bd authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/zeroconf.el (zeroconf-resolve-service)

(zeroconf-service-resolver-handler): Use
`dbus-byte-array-to-string'.
(zeroconf-publish-service): Use `dbus-string-to-byte-array'.
parent 112dbc0e
2010-07-03 Michael Albinus <michael.albinus@gmx.de>
* net/zeroconf.el (zeroconf-resolve-service)
(zeroconf-service-resolver-handler): Use
`dbus-byte-array-to-string'.
(zeroconf-publish-service): Use `dbus-string-to-byte-array'.
2010-07-03 Jan Moringen <jan.moringen@uni-bielefeld.de>
* net/zeroconf.el (zeroconf-service-remove-hook): New defun.
......
......@@ -424,7 +424,7 @@ TYPE. The resulting list has the format
(elt (nth 9 result))) ;; TXT.
;; The TXT field has the signature "aay". Transform to "as".
(while elt
(setcar elt (apply 'string (car elt)))
(setcar elt (dbus-byte-array-to-string (car elt)))
(setq elt (cdr elt)))
(when nil ;; We discard it, no use so far.
......@@ -616,7 +616,7 @@ DOMAIN is nil, the local domain is used."
;; The "TXT" field has the signature "aay". Transform to "as".
(let ((elt (nth 9 val)))
(while elt
(setcar elt (apply 'string (car elt)))
(setcar elt (dbus-byte-array-to-string (car elt)))
(setq elt (cdr elt))))
(when zeroconf-debug
(message "zeroconf-service-resolver-handler: %s %S"
......@@ -658,11 +658,7 @@ For the description of arguments, see `zeroconf-resolved-services-hash'."
;; The TXT field has the signature "as". Transform to "aay".
(dolist (elt txt)
(let (args)
(add-to-list
'result
(dolist (elt1 (string-to-list elt) (append '(:array) args))
(setq args (append args (list :byte elt1)))))))
(add-to-list 'result (dbus-string-to-byte-array elt)))
;; Add the service.
(dbus-call-method
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment