From 622cc8af6181d7e3d839ec0bdfad376648863844 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 11 Jul 2005 16:12:50 +0000 Subject: 2005-07-11 Colin Walters * 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. --- dbus/dbus-glib.h | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'dbus') diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h index ad156b83..5b5095d7 100644 --- a/dbus/dbus-glib.h +++ b/dbus/dbus-glib.h @@ -115,34 +115,6 @@ void dbus_g_connection_register_g_object (DBusGConnection *connectio GObject * dbus_g_connection_lookup_g_object (DBusGConnection *connection, const char *at_path); - -/** - * Generic recursive value - */ - -typedef struct _DBusGValueIterator DBusGValueIterator; -struct _DBusGValueIterator -{ - void *dummy1; /**< Don't use this */ - void *dummy2; /**< Don't use this */ - guint32 dummy3; /**< Don't use this */ - int dummy4; /**< Don't use this */ - int dummy5; /**< Don't use this */ - int dummy6; /**< Don't use this */ - int dummy7; /**< Don't use this */ - int dummy8; /**< Don't use this */ - int dummy9; /**< Don't use this */ - int dummy10; /**< Don't use this */ - int dummy11; /**< Don't use this */ - int pad1; /**< Don't use this */ - int pad2; /**< Don't use this */ - void *pad3; /**< Don't use this */ - void *pad4; /**< Don't use this */ - void *pad5; /**< Don't use this */ -}; - -typedef struct _DBusGValue DBusGValue; - #ifdef DBUS_COMPILATION #include "glib/dbus-gtype-specialized.h" #else @@ -160,30 +132,9 @@ typedef struct _DBusGValue DBusGValue; #define DBUS_TYPE_G_STRING_STRING_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING)) -/* Generic recursive value */ -GType dbus_g_value_get_g_type (void) G_GNUC_CONST; -#define DBUS_TYPE_G_VALUE (dbus_g_value_get_g_type ()) - GType dbus_g_object_path_get_g_type (void) G_GNUC_CONST; #define DBUS_TYPE_G_OBJECT_PATH (dbus_g_object_path_get_g_type ()) -void dbus_g_value_open (DBusGValue *value, - DBusGValueIterator *iter); - -GType dbus_g_value_iterator_get_value (DBusGValueIterator *iter, - GValue *value); - -gboolean dbus_g_value_iterator_get_values (DBusGValueIterator *iter, - GError **error, - GValue *first_val, - ...); - -void dbus_g_value_iterator_recurse (DBusGValueIterator *iter, - DBusGValueIterator *sub); - -void dbus_g_value_free (DBusGValue *value); - - void dbus_g_object_register_marshaller (GClosureMarshal marshaller, GType rettype, ...); -- cgit