Mercurial > emacs

comparison src/dbusbind.c @ 98901:f98d4eaeba07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols in arrays.
author Michael Albinus <michael.albinus@gmx.de>
date Sun, 19 Oct 2008 18:51:19 +0000
parents 9ae4dbce33ae
children 35372c2ca5c9
comparison
equal deleted inserted replaced
98900:b5b2e1c97f37 98901:f98d4eaeba07
160 : (NATNUMP (object)) ? DBUS_TYPE_UINT32 \ 160 : (NATNUMP (object)) ? DBUS_TYPE_UINT32 \
161 : (INTEGERP (object)) ? DBUS_TYPE_INT32 \ 161 : (INTEGERP (object)) ? DBUS_TYPE_INT32 \
162 : (FLOATP (object)) ? DBUS_TYPE_DOUBLE \ 162 : (FLOATP (object)) ? DBUS_TYPE_DOUBLE \
163 : (STRINGP (object)) ? DBUS_TYPE_STRING \ 163 : (STRINGP (object)) ? DBUS_TYPE_STRING \
164 : (XD_DBUS_TYPE_P (object)) ? XD_SYMBOL_TO_DBUS_TYPE (object) \ 164 : (XD_DBUS_TYPE_P (object)) ? XD_SYMBOL_TO_DBUS_TYPE (object) \
165 : (CONSP (object)) ? ((XD_DBUS_TYPE_P (CAR_SAFE (object))) \ 165 : (CONSP (object)) \
166 ? XD_SYMBOL_TO_DBUS_TYPE (CAR_SAFE (object)) \ 166 ? ((XD_DBUS_TYPE_P (CAR_SAFE (object))) \
167 : DBUS_TYPE_ARRAY) \ 167 ? ((XD_BASIC_DBUS_TYPE (XD_SYMBOL_TO_DBUS_TYPE (CAR_SAFE (object)))) \
168 ? DBUS_TYPE_ARRAY \
169 : XD_SYMBOL_TO_DBUS_TYPE (CAR_SAFE (object))) \
170 : DBUS_TYPE_ARRAY) \
168 : DBUS_TYPE_INVALID) 171 : DBUS_TYPE_INVALID)
169 172
170 /* Return a list pointer which does not have a Lisp symbol as car. */ 173 /* Return a list pointer which does not have a Lisp symbol as car. */
171 #define XD_NEXT_VALUE(object) \ 174 #define XD_NEXT_VALUE(object) \
172 ((XD_DBUS_TYPE_P (CAR_SAFE (object))) ? CDR_SAFE (object) : object) 175 ((XD_DBUS_TYPE_P (CAR_SAFE (object))) ? CDR_SAFE (object) : object)