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

1825653e · Michael Albinus · 526e126f · 1825653e · 1825653e
Commit 1825653e authored Feb 18, 2014 by Michael Albinus
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

src/ChangeLog src/ChangeLog +4 -0

src/dbusbind.c src/dbusbind.c +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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).

--- 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;
  }