;;; zeroconf.el --- Service browser using Avahi.
-;; Copyright (C) 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, hardware
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, see
-;; <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; disabled with configuration option "--without-dbus". Declare used
;; subroutines and variables of `dbus' therefore.
(eval-when-compile
- (require 'cl)
- (declare-function dbus-call-method "dbusbind.c")
- (declare-function dbus-register-signal "dbusbind.c")
- (defvar dbus-debug))
+ (require 'cl))
+
+(declare-function dbus-call-method "dbusbind.c")
+(declare-function dbus-register-signal "dbusbind.c")
+(defvar dbus-debug)
(require 'dbus)
(let ((l-hook (gethash type zeroconf-service-removed-hooks-hash nil)))
(add-hook 'l-hook function)
(puthash type l-hook zeroconf-service-removed-hooks-hash)))
- (t (error "EVENT must be either `:new' or `:removed'."))))
+ (t (error "EVENT must be either `:new' or `:removed'"))))
+
+(defun zeroconf-service-remove-hook (type event function)
+ "Remove FUNCTION from the hook of service type TYPE.
+
+EVENT must be either :new or :removed and has to match the event
+type used when registering FUNCTION."
+ (let* ((table (cond
+ ((equal event :new)
+ zeroconf-service-added-hooks-hash)
+ ((equal event :removed)
+ zeroconf-service-removed-hooks-hash)
+ (t (error "EVENT must be either `:new' or `:removed'"))))
+ (l-hook (gethash type table nil)))
+ (remove-hook 'l-hook function)
+ (if l-hook
+ (puthash type l-hook table)
+ (remhash type table))))
(defun zeroconf-get-host ()
"Returns the local host name as string."
(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.
(dbus-ping :system zeroconf-service-avahi)
(dbus-call-method
:system zeroconf-service-avahi zeroconf-path-avahi
- zeroconf-interface-avahi-server "IsNSSSupportAvailable"))
+ zeroconf-interface-avahi-server "GetVersionString"))
;; Reset all stored values.
(setq zeroconf-path-avahi-service-type-browser nil
;; 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"
;; 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