From 07a4cb035f1c37c867847e9ed7dc627294b109a1 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 19 Oct 2008 18:51:19 +0000 Subject: [PATCH] * dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols in arrays. --- src/dbusbind.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/dbusbind.c b/src/dbusbind.c index 7a30cabca2e..dcab6fb214c 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -162,9 +162,12 @@ Lisp_Object Vdbus_debug; : (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. */ -- 2.39.5