luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle 'a{o...}' and 'a{g...}' D-Bus signatures by using Collections.

Browse source 
[GB.DBUS]
* NEW: Handle 'a{o...}' and 'a{g...}' D-Bus signatures by using Collections.
This commit is contained in:
gambas 2022-01-17 01:02:50 +01:00
parent 683465e7a8
commit c7c8774f5b
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gb.dbus/src/gb.dbus/.src/MMain.module
View file

@ -139,7 +139,7 @@ Public Sub Main1()
End
Public Sub Main()
Public Sub Main4()
Dim hDBusApplication As DBusApplication
Dim hDBusProxy As DBusProxy
@ -153,10 +153,16 @@ Public Sub Main()
End
Public Sub Main5()
Public Sub Main()
'Print DBus["org.freedesktop.DBus"]._Introspect("/a")
Dim cManaged As Collection
'DBus["system://org.freedesktop.login1"]["/org/freedesktop/login1", "org.freedesktop.login1.Manager"].PowerOff(True)
Try Print DBus["system://org.freedesktop.UDisks2"]["/org/freedesktop/UDisks2", "org.freedesktop.DBus.Introspectable"].Introspect()
Try cManaged = DBus["system://org.freedesktop.UDisks2"]["/org/freedesktop/UDisks2", "org.freedesktop.DBus.ObjectManager"].GetManagedObjects()
If Error Then
Print Error.Text
Endif
End

11
gb.dbus/src/helper.c
View file

@ -201,6 +201,11 @@ static const char *to_dbus_type(GB_VALUE *arg)
return "v";
}
static bool can_be_string(const char signature)
{
return signature == 's' || signature == 'o' || signature == 'g';
}
static char *array_from_dbus_type(const char *signature)
{
static char type[DBUS_MAXIMUM_SIGNATURE_LENGTH + 1];
@ -222,7 +227,7 @@ static char *array_from_dbus_type(const char *signature)
case DBUS_TYPE_VARIANT: return "Variant[]";
case DBUS_TYPE_DICT_ENTRY:
if (signature[1] == 's')
if (can_be_string(signature[1]))
return "Collection";
else
return NULL;
@ -500,7 +505,7 @@ static bool append_arg(DBusMessageIter *iter, const char *signature, GB_VALUE *a
dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, contents_signature, &citer);
if (contents_signature[0] == '{' && contents_signature[1] == 's')
if (contents_signature[0] == '{' && can_be_string(contents_signature[1]))
{
GB_COLLECTION col = (GB_COLLECTION)(arg->_object.value);
char *key;
@ -764,7 +769,7 @@ static bool retrieve_arg(DBusMessageIter *iter, RETRIEVE_CALLBACK cb, void *para
signature_contents = dbus_message_iter_get_signature(&iter_contents);
if (signature_contents[0] == '{' && signature_contents[1] == 's')
if (signature_contents[0] == '{' && can_be_string(signature_contents[1]))
{
GB_COLLECTION col;
COLLECTION_ADD add;