emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Michael Albinus
Subject: [Emacs-diffs] Changes to emacs/lisp/net/dbus.el,v
Date: Sun, 16 Dec 2007 22:42:48 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/12/16 22:42:47

Index: net/dbus.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/dbus.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- net/dbus.el 8 Dec 2007 12:56:59 -0000       1.6
+++ net/dbus.el 16 Dec 2007 22:42:47 -0000      1.7
@@ -79,21 +79,17 @@
        '(lambda (key value)
          (dolist (elt value)
            ;; key has the structure (BUS INTERFACE SIGNAL).
-           ;; elt has the structure (SERVICE UNAME PATH HANDLER).
-           (when (string-equal old-owner (cadr elt))
+           ;; elt has the structure (UNAME SERVICE PATH HANDLER).
+           (when (string-equal old-owner (car elt))
              ;; Remove old key, and add new entry with changed name.
-             (when dbus-debug (message "Remove rule for %s %s" key elt))
-             ;(dbus-unregister-signal key)
-             (setcar (cdr elt) new-owner)
-             (when dbus-debug (message "Add rule for %s %s" key elt))
+             (dbus-unregister-signal (list key (cdr elt)))
              ;; Maybe we could arrange the lists a little bit better
              ;; that we don't need to extract every single element?
-             (when (not (zerop (length new-owner)))
                (dbus-register-signal
                 ;; BUS      SERVICE     PATH
-                (nth 0 key) (nth 0 elt) (nth 2 elt)
+              (nth 0 key) (nth 1 elt) (nth 2 elt)
                 ;; INTERFACE SIGNAL     HANDLER
-                (nth 1 key) (nth 2 key) (nth 3 elt))))))
+              (nth 1 key) (nth 2 key) (nth 3 elt)))))
        (copy-hash-table dbus-registered-functions-table)))))
 
 ;; Register the handler.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]