From: Michael Albinus <albinus@detlef>
Date: Sat, 3 Jul 2010 10:52:17 +0000 (+0200)
Subject: * net/zeroconf.el (zeroconf-service-remove-hook): New defun.
X-Git-Tag: emacs-pretest-23.2.90~139^2~70
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=112dbc0eee5f7960fd754fb75e44d998cf9b4a5b;p=emacs.git

* net/zeroconf.el (zeroconf-service-remove-hook): New defun.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e791d21f507..50de27e6b2d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-03  Jan Moringen  <jan.moringen@uni-bielefeld.de>
+
+	* net/zeroconf.el (zeroconf-service-remove-hook): New defun.
+
 2010-06-30  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	Avoid displaying files with a nil state in vc-dir.
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index b0b98fc57f3..43719aa9763 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -336,6 +336,23 @@ The attributes of SERVICE can be retrieved via the functions
       (puthash type l-hook zeroconf-service-removed-hooks-hash)))
    (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."
   (dbus-call-method