Commit 1825653e authored by Michael Albinus's avatar Michael Albinus
Browse files

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

parent 526e126f
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> 2014-02-17 Paul Eggert <eggert@cs.ucla.edu>
temacs --daemon fix (Bug#16599). temacs --daemon fix (Bug#16599).
......
...@@ -973,7 +973,7 @@ xd_get_connection_references (DBusConnection *connection) ...@@ -973,7 +973,7 @@ xd_get_connection_references (DBusConnection *connection)
return *refcount; return *refcount;
} }
/* Convert a Lisp dbus object to a pointer */ /* Convert a Lisp D-Bus object to a pointer. */
static DBusConnection* static DBusConnection*
xd_lisp_dbus_to_dbus (Lisp_Object bus) xd_lisp_dbus_to_dbus (Lisp_Object bus)
{ {
...@@ -1095,7 +1095,7 @@ xd_close_bus (Lisp_Object bus) ...@@ -1095,7 +1095,7 @@ xd_close_bus (Lisp_Object bus)
return; return;
busobj = CDR_SAFE(val); busobj = CDR_SAFE(val);
if (NILP (val)) { if (NILP (busobj)) {
xd_registered_buses = Fdelete (val, xd_registered_buses); xd_registered_buses = Fdelete (val, xd_registered_buses);
return; return;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment