Miroirs/awesome
1
0
Fork 0
mirror of https://github.com/awesomeWM/awesome synced 2024-11-16 07:47:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: fix fixed array handling

Browse source 
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-03-11 16:17:05 +01:00
parent 01a74e9c9e
commit dd862007a9
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dbus.c
View file

@ -80,14 +80,18 @@ a_dbus_message_iter(DBusMessageIter *iter)
lua_newtable(globalconf.L); lua_newtable(globalconf.L);
if(dbus_type_is_fixed(array_type)) if(dbus_type_is_fixed(array_type))
{
DBusMessageIter sub;
dbus_message_iter_recurse(iter, &sub);
switch(array_type) switch(array_type)
{ {
int datalen; int datalen = 0;
#define DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(type, dbustype) \ #define DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(type, dbustype) \
case dbustype: \ case dbustype: \
{ \ { \
type *data; \ type *data; \
dbus_message_iter_get_fixed_array(iter, &data, &datalen); \ dbus_message_iter_get_fixed_array(&sub, &data, &datalen); \
for(int i = 0; i < datalen; i++) \ for(int i = 0; i < datalen; i++) \
{ \ { \
lua_pushnumber(globalconf.L, data[i]); \ lua_pushnumber(globalconf.L, data[i]); \
@ -103,6 +107,7 @@ a_dbus_message_iter(DBusMessageIter *iter)
DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(uint64_t, DBUS_TYPE_UINT64) DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(uint64_t, DBUS_TYPE_UINT64)
#undef DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER #undef DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER
} }
}
else if(array_type == DBUS_TYPE_DICT_ENTRY) else if(array_type == DBUS_TYPE_DICT_ENTRY)
{ {
DBusMessageIter subiter; DBusMessageIter subiter;