* dbusbind.c (xd_close_bus): Apply proper check on busobj.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8592eef6251f130df478fb9008809469822d7d1c..1db4d4ac3755c040d59a0ec589e70c025f0f4b6f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-18  Michael Albinus  <michael.albinus@gmx.de>
+
+       * dbusbind.c (xd_close_bus): Apply proper check on busobj.
+
 2014-02-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        temacs --daemon fix (Bug#16599).

diff --git a/src/dbusbind.c b/src/dbusbind.c
index f6df5107db15e9b15d1b4c2381fd517221a58146..1c386f02c9059bd8d516f4dcce1315e07428a412 100644 (file)
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -973,7 +973,7 @@ xd_get_connection_references (DBusConnection *connection)
   return *refcount;
 }
 
-/* Convert a Lisp dbus object to a pointer */
+/* Convert a Lisp D-Bus object to a pointer.  */
 static DBusConnection*
 xd_lisp_dbus_to_dbus (Lisp_Object bus)
 {
@@ -1095,7 +1095,7 @@ xd_close_bus (Lisp_Object bus)
     return;
 
   busobj = CDR_SAFE(val);
-  if (NILP (val)) {
+  if (NILP (busobj)) {
     xd_registered_buses = Fdelete (val, xd_registered_buses);
     return;
   }