[Emacs-diffs] trunk r116470: * dbusbind.c (xd_close_bus): Apply proper check on busobj.

[Michael Albinus]

------------------------------------------------------------
revno: 116470
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-18 08:46:38 +0100
message:
  * dbusbind.c (xd_close_bus): Apply proper check on busobj.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dbusbind.c                 dbusbind.c-20091113204419-o5vbwnq5f7feedwu-7961

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-17 21:20:44 +0000
+++ b/src/ChangeLog     2014-02-18 07:46:38 +0000
@@ -1,3 +1,7 @@
+2014-02-18  Michael Albinus  <address@hidden>
+
+       * dbusbind.c (xd_close_bus): Apply proper check on busobj.
+
 2014-02-17  Paul Eggert  <address@hidden>
 
        temacs --daemon fix (Bug#16599).

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2014-02-16 05:43:44 +0000
+++ b/src/dbusbind.c    2014-02-18 07:46:38 +0000
@@ -973,7 +973,7 @@
   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 @@
     return;
 
   busobj = CDR_SAFE(val);
-  if (NILP (val)) {
+  if (NILP (busobj)) {
     xd_registered_buses = Fdelete (val, xd_registered_buses);
     return;
   }