* 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'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50de27e6b2d01007a2e1e6fded0215ae78013abd..1fb6ccc2b658e6da756c36b4548178237e6567a8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index 43719aa9763a28995e022c951419f7759d191842..e49a45c8a4809a89d75b231217f8f6d6a8282a60 100644 (file)
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -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