* net/dbus.el (dbus-name-owner-changed-handler): Use

	dbus-unregister-object instead of dbus-unregister-signal.

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9228f8e93c6..cf8750ab348 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-03  Magnus Henoch  <magnus@zemdatav>
+
+        * net/dbus.el (dbus-name-owner-changed-handler): Use
+        dbus-unregister-object instead of dbus-unregister-signal.
+
 2008-01-03  Drew Adams  <drew.adams@oracle.com>
 
         * frame.el (frame-geom-value-cons, frame-geom-spec-cons): New fns.
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 1c1016aed97..f8f422c5c1f 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1,7 +1,7 @@
 ;;; -*- no-byte-compile: t; -*-
 ;;; dbus.el --- Elisp bindings for D-Bus.
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, hardware
@@ -92,7 +92,7 @@ usage: (dbus-name-owner-changed-handler service old-owner new-owner)"
                   ;; 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.
-                    (dbus-unregister-signal (list key (cdr elt)))
+                    (dbus-unregister-object (list key (cdr elt)))
                     ;; Maybe we could arrange the lists a little bit better
                     ;; that we don't need to extract every single element?
                     (dbus-register-signal