# HG changeset patch
# User Michael Albinus <albinus@detlef>
# Date 1278155573 -7200
# Node ID 6e3815c69ab42c67d25a3470f9b58ac5cd459b6e
# Parent  1cedbb610cc1d91a439f2435a2e67335bfa35d05
* 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 -r 1cedbb610cc1 -r 6e3815c69ab4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jul 03 12:52:17 2010 +0200
+++ b/lisp/ChangeLog	Sat Jul 03 13:12:53 2010 +0200
@@ -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 -r 1cedbb610cc1 -r 6e3815c69ab4 lisp/net/zeroconf.el
--- a/lisp/net/zeroconf.el	Sat Jul 03 12:52:17 2010 +0200
+++ b/lisp/net/zeroconf.el	Sat Jul 03 13:12:53 2010 +0200
@@ -424,7 +424,7 @@
 	      (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 @@
   ;; 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 @@
 
     ;; 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