# HG changeset patch # User Michael Albinus # Date 1224442279 0 # Node ID f98d4eaeba07492086003fd6f3a75200a291fd64 # Parent b5b2e1c97f37de158b87c31e0fc745cf32743d6a * dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols in arrays. diff -r b5b2e1c97f37 -r f98d4eaeba07 src/dbusbind.c --- a/src/dbusbind.c Sun Oct 19 18:50:16 2008 +0000 +++ b/src/dbusbind.c Sun Oct 19 18:51:19 2008 +0000 @@ -162,9 +162,12 @@ : (FLOATP (object)) ? DBUS_TYPE_DOUBLE \ : (STRINGP (object)) ? DBUS_TYPE_STRING \ : (XD_DBUS_TYPE_P (object)) ? XD_SYMBOL_TO_DBUS_TYPE (object) \ - : (CONSP (object)) ? ((XD_DBUS_TYPE_P (CAR_SAFE (object))) \ - ? XD_SYMBOL_TO_DBUS_TYPE (CAR_SAFE (object)) \ - : DBUS_TYPE_ARRAY) \ + : (CONSP (object)) \ + ? ((XD_DBUS_TYPE_P (CAR_SAFE (object))) \ + ? ((XD_BASIC_DBUS_TYPE (XD_SYMBOL_TO_DBUS_TYPE (CAR_SAFE (object)))) \ + ? DBUS_TYPE_ARRAY \ + : XD_SYMBOL_TO_DBUS_TYPE (CAR_SAFE (object))) \ + : DBUS_TYPE_ARRAY) \ : DBUS_TYPE_INVALID) /* Return a list pointer which does not have a Lisp symbol as car. */