* dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols

in arrays.

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 7a30cabca2ea5fa989dcb9ca411e8a5ac91d46bb..dcab6fb214c338fe6489879c3894be331b017629 100644 (file)
--- 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.  */