mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-26 22:40:08 +01:00
2b97fb81a5
* glib/dbus-gidl.c (property_info_get_type, arg_info_get_type): Change return value to const char * instead of int so we can do full signatures. (struct PropertyInfo, struct ArgInfo): Store char *. (property_info_new, arg_info_new): Update parameters, strdup. (property_info_unref, arg_info_unref): Free. * glib/dbus-gidl.h: Update prototypes. * glib/dbus-gparser.c (basic_type_from_string): Delete. (validate_signature): New function, just validates signature and sets GError. (parse_property, parse_arg): Invoke validate_signature. Store signature instead of just type code. * glib/dbus-gvalue.c (base_type_from_signature): New utility function to return a primary type for a signature, dropping information about types in container types. (dbus_gvalue_genmarshal_name_from_type) (dbus_gvalue_binding_type_from_type) (dbus_gvalue_ctype_from_type): Update to take full signature instead of type code. (dbus_gtype_to_dbus_type): Moved here from glib/dbus-gobject.c. * glib/dbus-gvalue.h: Update prototypes for above. * glib/dbus-gobject.c (gtype_to_dbus_type): Moved to glib/dbus-gvalue.c as dbus_gtype_to_dbus_type. (introspect_properties, introspect_signals, write_interface): Update to handle signatures, and remove usage of _dbus_gutils_type_to_string. (handle_introspect): Print out type codes instead of e.g. "string" in hardcoded introspection XML; also use x_AS_STRING constants instead of hardcoding in string. * glib/dbus-glib-tool.c (pretty_print): Handle signature change to string. Remove usage of _dbus_gutils_type_to_string. * glib/dbus-gutils.c (_dbus_gutils_type_to_string): Delete. * glib/dbus-gutils.h (_dbus_gutils_type_to_string): Update for deletion. * glib/dbus-binding-tool-glib.c (compute_marshaller) (compute_marshaller_name, generate_glue): Handle signature change to string. (write_formal_parameters, write_args_for_direction): Ditto, and remove FIXME. * tools/dbus-tree-view.c (type_to_string): Delete. (info_set_func_text): Update to print full signatures. * test/glib/test-service-glib.xml: Change types to new introspection format.
42 lines
1 KiB
C
42 lines
1 KiB
C
#ifndef DBUS_GOBJECT_VALUE_H
|
|
#define DBUS_GOBJECT_VALUE_H
|
|
|
|
#include <dbus/dbus.h>
|
|
#include <glib.h>
|
|
#include <glib-object.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
/* Used for return value storage */
|
|
typedef union
|
|
{
|
|
gboolean gboolean_val;
|
|
guchar guchar_val;
|
|
gint int_val;
|
|
gint64 gint64_val;
|
|
guint64 guint64_val;
|
|
double double_val;
|
|
gpointer gpointer_val;
|
|
char * chararray_val;
|
|
} DBusBasicGValue;
|
|
|
|
const char * dbus_gvalue_genmarshal_name_from_type (const char *type);
|
|
|
|
const char * dbus_gvalue_ctype_from_type (const char *type, gboolean in);
|
|
|
|
const char * dbus_gvalue_binding_type_from_type (const char *type);
|
|
|
|
const char * dbus_gtype_to_dbus_type (GType type);
|
|
|
|
gboolean dbus_gvalue_init (int type,
|
|
GValue *value);
|
|
|
|
gboolean dbus_gvalue_demarshal (DBusMessageIter *iter,
|
|
GValue *value);
|
|
gboolean dbus_gvalue_marshal (DBusMessageIter *iter,
|
|
GValue *value);
|
|
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* DBUS_GOBJECT_VALUE_H */
|