mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-28 14:20:09 +01:00
* glib/dbus-gvalue.c (struct _DBusGValue): Delete. (dbus_g_value_types_init): Remove assertion. (dbus_g_value_get_g_type, dbus_g_value_open) (dbus_g_value_iterator_get_values, dbus_g_value_get_signature) (dbus_g_value_copy, dbus_g_value_free): Delete unimplemented functions related to DBusGValue. Now we marshal/demarshal structures as GValueArray. (dbus_gtype_from_signature_iter): Return G_TYPE_VALUE_ARRAY for structures. (signature_iter_to_g_type_array): Don't call signature_iter_to_g_type_struct. (signature_iter_to_g_type_struct): Delete. (dbus_gvalue_to_signature): Delete. (dbus_gvalue_to_signature): New function with same name as other one; we can convert structures to signatures. (demarshal_valuearray): New function. (get_type_demarshaller): Use it. (demarshal_recurse): Delete. (marshal_proxy): New function. (marshal_map): Warn if we can't determine signature from type. (marshal_collection_ptrarray): Ditto. (marshal_collection_array): Ditto. (get_type_marshaller): Use marshal_valuearray. (marshal_recurse): Delete. (_dbus_gvalue_test): Add some tests. * dbus/dbus-glib.h (struct _DBusGValueIterator): (dbus_g_value_get_g_type, DBUS_TYPE_G_VALUE) (dbus_g_value_open, dbus_g_value_iterator_get_value) (dbus_g_value_iterator_get_values, dbus_g_value_iterator_recurse) (dbus_g_value_free): Remove prototypes. * glib/dbus-binding-tool-glib.c (dbus_g_type_get_lookup_function): Handle G_TYPE_VALUE_ARRAY. * glib/examples/example-service.c: * glib/examples/example-client.c: Implement GetTuple. * test/glib/test-dbus-glib.c: * test/glib/test-service-glib.c: * test/glib/test-service-glib.xml: Add structure tests.
121 lines
3.4 KiB
C
121 lines
3.4 KiB
C
#include <dbus/dbus-glib.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
static void lose (const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2);
|
|
static void lose_gerror (const char *prefix, GError *error) G_GNUC_NORETURN;
|
|
|
|
static void
|
|
lose (const char *str, ...)
|
|
{
|
|
va_list args;
|
|
|
|
va_start (args, str);
|
|
|
|
vfprintf (stderr, str, args);
|
|
fputc ('\n', stderr);
|
|
|
|
va_end (args);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
static void
|
|
lose_gerror (const char *prefix, GError *error)
|
|
{
|
|
lose ("%s: %s", prefix, error->message);
|
|
}
|
|
|
|
static void
|
|
print_hash_value (gpointer key, gpointer val, gpointer data)
|
|
{
|
|
printf ("%s -> %s\n", (char *) key, (char *) val);
|
|
}
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
DBusGConnection *bus;
|
|
DBusGProxy *remote_object;
|
|
DBusGProxy *remote_object_introspectable;
|
|
GError *error = NULL;
|
|
char **reply_list;
|
|
char **reply_ptr;
|
|
GValueArray *hello_reply_struct;
|
|
GHashTable *hello_reply_dict;
|
|
char *introspect_data;
|
|
guint i;
|
|
|
|
g_type_init ();
|
|
|
|
{
|
|
GLogLevelFlags fatal_mask;
|
|
|
|
fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
|
|
fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
|
|
g_log_set_always_fatal (fatal_mask);
|
|
}
|
|
|
|
bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
|
|
if (!bus)
|
|
lose_gerror ("Couldn't connect to session bus", error);
|
|
|
|
remote_object = dbus_g_proxy_new_for_name (bus,
|
|
"org.designfu.SampleService",
|
|
"/SomeObject",
|
|
"org.designfu.SampleInterface");
|
|
|
|
if (!dbus_g_proxy_call (remote_object, "HelloWorld", &error,
|
|
G_TYPE_STRING, "Hello from example-client.c!", G_TYPE_INVALID,
|
|
G_TYPE_STRV, &reply_list, G_TYPE_INVALID))
|
|
lose_gerror ("Failed to complete HelloWorld", error);
|
|
|
|
|
|
if (!dbus_g_proxy_call (remote_object, "GetTuple", &error,
|
|
G_TYPE_INVALID,
|
|
G_TYPE_VALUE_ARRAY, &hello_reply_struct, G_TYPE_INVALID))
|
|
lose_gerror ("Failed to complete GetTuple", error);
|
|
|
|
if (!dbus_g_proxy_call (remote_object, "GetDict", &error,
|
|
G_TYPE_INVALID,
|
|
DBUS_TYPE_G_STRING_STRING_HASHTABLE, &hello_reply_dict, G_TYPE_INVALID))
|
|
lose_gerror ("Failed to complete GetDict", error);
|
|
|
|
printf ("reply_list: ");
|
|
for (reply_ptr = reply_list; *reply_ptr; reply_ptr++)
|
|
printf ("\"%s\" ", *reply_ptr);
|
|
printf ("\n");
|
|
g_strfreev (reply_list);
|
|
|
|
for (i = 0; i < hello_reply_struct->n_values; i++)
|
|
{
|
|
GValue strval = { 0, };
|
|
|
|
g_value_init (&strval, G_TYPE_STRING);
|
|
if (!g_value_transform (g_value_array_get_nth (hello_reply_struct, i), &strval))
|
|
g_value_set_static_string (&strval, "(couldn't transform to string)");
|
|
g_print ("%s: %s\n", g_type_name (G_VALUE_TYPE (g_value_array_get_nth (hello_reply_struct, i))),
|
|
g_value_get_string (&strval));
|
|
}
|
|
g_value_array_free (hello_reply_struct);
|
|
printf ("\n");
|
|
|
|
g_hash_table_foreach (hello_reply_dict, print_hash_value, NULL);
|
|
g_hash_table_destroy (hello_reply_dict);
|
|
|
|
remote_object_introspectable = dbus_g_proxy_new_for_name (bus,
|
|
"org.designfu.SampleService",
|
|
"/SomeObject",
|
|
"org.freedesktop.DBus.Introspectable");
|
|
if (!dbus_g_proxy_call (remote_object_introspectable, "Introspect", &error,
|
|
G_TYPE_INVALID,
|
|
G_TYPE_STRING, &introspect_data, G_TYPE_INVALID))
|
|
lose_gerror ("Failed to complete Introspect", error);
|
|
printf ("%s", introspect_data);
|
|
g_free (introspect_data);
|
|
|
|
g_object_unref (G_OBJECT (remote_object_introspectable));
|
|
g_object_unref (G_OBJECT (remote_object));
|
|
|
|
exit(0);
|
|
}
|