mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-30 21:10:11 +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.
153 lines
4.1 KiB
C
153 lines
4.1 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);
|
|
}
|
|
|
|
typedef struct SomeObject SomeObject;
|
|
typedef struct SomeObjectClass SomeObjectClass;
|
|
|
|
GType some_object_get_type (void);
|
|
|
|
struct SomeObject
|
|
{
|
|
GObject parent;
|
|
};
|
|
|
|
struct SomeObjectClass
|
|
{
|
|
GObjectClass parent;
|
|
};
|
|
|
|
#define SOME_TYPE_OBJECT (some_object_get_type ())
|
|
#define SOME_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), SOME_TYPE_OBJECT, SomeObject))
|
|
#define SOME_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SOME_TYPE_OBJECT, SomeObjectClass))
|
|
#define SOME_IS_OBJECT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), SOME_TYPE_OBJECT))
|
|
#define SOME_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SOME_TYPE_OBJECT))
|
|
#define SOME_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SOME_TYPE_OBJECT, SomeObjectClass))
|
|
|
|
G_DEFINE_TYPE(SomeObject, some_object, G_TYPE_OBJECT)
|
|
|
|
gboolean some_object_hello_world (SomeObject *obj, const char *hello_message, char ***ret, GError **error);
|
|
gboolean some_object_get_tuple (SomeObject *obj, GValueArray **ret, GError **error);
|
|
gboolean some_object_get_dict (SomeObject *obj, GHashTable **ret, GError **error);
|
|
|
|
#include "example-service-glue.h"
|
|
|
|
static void
|
|
some_object_init (SomeObject *obj)
|
|
{
|
|
}
|
|
|
|
static void
|
|
some_object_class_init (SomeObjectClass *klass)
|
|
{
|
|
}
|
|
|
|
gboolean
|
|
some_object_hello_world (SomeObject *obj, const char *hello_message, char ***ret, GError **error)
|
|
{
|
|
printf ("%s\n", hello_message);
|
|
*ret = g_new (char *, 3);
|
|
(*ret)[0] = g_strdup ("Hello");
|
|
(*ret)[1] = g_strdup (" from example-service.c");
|
|
(*ret)[2] = NULL;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
gboolean
|
|
some_object_get_tuple (SomeObject *obj, GValueArray **ret, GError **error)
|
|
{
|
|
*ret = g_value_array_new (6);
|
|
g_value_array_prepend (*ret, NULL);
|
|
g_value_init (g_value_array_get_nth (*ret, 0), G_TYPE_STRING);
|
|
g_value_set_string (g_value_array_get_nth (*ret, 0), "hello");
|
|
g_value_array_prepend (*ret, NULL);
|
|
g_value_init (g_value_array_get_nth (*ret, 0), G_TYPE_UINT);
|
|
g_value_set_uint (g_value_array_get_nth (*ret, 0), 42);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
gboolean
|
|
some_object_get_dict (SomeObject *obj, GHashTable **ret, GError **error)
|
|
{
|
|
*ret = g_hash_table_new (g_str_hash, g_str_equal);
|
|
g_hash_table_insert (*ret, "first", "Hello Dict");
|
|
g_hash_table_insert (*ret, "second", " from example-service.c");
|
|
return TRUE;
|
|
}
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
DBusGConnection *bus;
|
|
DBusGProxy *bus_proxy;
|
|
GError *error = NULL;
|
|
SomeObject *obj;
|
|
GMainLoop *mainloop;
|
|
guint request_name_result;
|
|
|
|
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);
|
|
}
|
|
|
|
dbus_g_object_type_install_info (SOME_TYPE_OBJECT, &dbus_glib_some_object_object_info);
|
|
|
|
mainloop = g_main_loop_new (NULL, FALSE);
|
|
|
|
bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
|
|
if (!bus)
|
|
lose_gerror ("Couldn't connect to session bus", error);
|
|
|
|
bus_proxy = dbus_g_proxy_new_for_name (bus, "org.freedesktop.DBus",
|
|
"/org/freedesktop/DBus",
|
|
"org.freedesktop.DBus");
|
|
|
|
if (!dbus_g_proxy_call (bus_proxy, "RequestName", &error,
|
|
G_TYPE_STRING, "org.designfu.SampleService",
|
|
G_TYPE_UINT, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
|
|
G_TYPE_INVALID,
|
|
G_TYPE_UINT, &request_name_result,
|
|
G_TYPE_INVALID))
|
|
lose_gerror ("Failed to acquire org.designfu.SampleService", error);
|
|
|
|
obj = g_object_new (SOME_TYPE_OBJECT, NULL);
|
|
|
|
dbus_g_connection_register_g_object (bus, "/SomeObject", G_OBJECT (obj));
|
|
|
|
printf ("service running\n");
|
|
|
|
g_main_loop_run (mainloop);
|
|
|
|
exit (0);
|
|
}
|