From 1825653e3dd0c9f1d6361f0afc62301b68015acc Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 18 Feb 2014 08:46:38 +0100 Subject: [PATCH] * dbusbind.c (xd_close_bus): Apply proper check on busobj. --- src/ChangeLog | 4 ++++ src/dbusbind.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8592eef625..1db4d4ac37 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-02-18 Michael Albinus + + * dbusbind.c (xd_close_bus): Apply proper check on busobj. + 2014-02-17 Paul Eggert temacs --daemon fix (Bug#16599). diff --git a/src/dbusbind.c b/src/dbusbind.c index f6df5107db..1c386f02c9 100644 --- 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; } -- 2.20.1