[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99913: * net/zeroconf.el (zeroconf-resolve-service)

[Michael Albinus]

------------------------------------------------------------
revno: 99913
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-07-03 13:12:53 +0200
message:
  * 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'.
modified:
  lisp/ChangeLog
  lisp/net/zeroconf.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-07-03 10:52:17 +0000
+++ b/lisp/ChangeLog    2010-07-03 11:12:53 +0000
@@ -1,3 +1,10 @@
+2010-07-03  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/zeroconf.el (zeroconf-service-remove-hook): New defun.

=== modified file 'lisp/net/zeroconf.el'
--- a/lisp/net/zeroconf.el      2010-07-03 10:52:17 +0000
+++ b/lisp/net/zeroconf.el      2010-07-03 11:12:53 +0000
@@ -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