diff options
| author | Michael Albinus | 2008-10-19 18:51:19 +0000 |
|---|---|---|
| committer | Michael Albinus | 2008-10-19 18:51:19 +0000 |
| commit | 07a4cb035f1c37c867847e9ed7dc627294b109a1 (patch) | |
| tree | 2392ae240456d601764cc1620e0c941b3022d5b6 /src/dbusbind.c | |
| parent | f549eb0bd9c6436ca0f70555cb784a0d61b9e160 (diff) | |
| download | emacs-07a4cb035f1c37c867847e9ed7dc627294b109a1.tar.gz emacs-07a4cb035f1c37c867847e9ed7dc627294b109a1.zip | |
* dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols
in arrays.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 9 |
1 files 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; | |||
| 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. */ |