[Emacs-diffs] Changes to emacs/lisp/net/dbus.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/12/05 21:59:12

Index: net/dbus.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/dbus.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- net/dbus.el 4 Dec 2007 22:41:47 -0000       1.3
+++ net/dbus.el 5 Dec 2007 21:59:12 -0000       1.4
@@ -57,13 +57,22 @@
    ;; Bus symbol, either :system or :session.
    (symbolp (car x)) (symbolp (car y)) (equal  (car x) (car y))
    ;; Interface.
-   (stringp (cadr x)) (stringp (cadr y)) (string-equal  (cadr x) (cadr y))
+   (or
+    (null (cadr x)) (null (cadr y)) ; wildcard
+    (and
+     (stringp (cadr x)) (stringp (cadr y)) (string-equal (cadr x) (cadr y))))
    ;; Member.
-   (stringp (caddr x)) (stringp (caddr y)) (string-equal  (caddr x) (caddr 
y))))
-
-(define-hash-table-test 'dbus-hash-table-test
-  'dbus-hash-table= 'sxhash)
-
+   (or
+    (null (caddr x)) (null (caddr y)) ; wildcard
+    (and
+     (stringp (caddr x)) (stringp (caddr y))
+     (string-equal (caddr x) (caddr y))))))
+
+(define-hash-table-test 'dbus-hash-table-test 'dbus-hash-table= 'sxhash)
+
+;; When we assume that interface and and member are always strings in
+;; the key, we could use `equal' as test function.  But we want to
+;; have also `nil' there, being a wildcard.
 (setq dbus-registered-functions-table
       (make-hash-table :test 'dbus-hash-table-test))