diff options
| author | Colin Walters <walters@verbum.org> | 2005-06-29 23:52:35 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-06-29 23:52:35 +0000 |
| commit | b3c42d226438fd0fda2db19b92944dec5e226d3f (patch) | |
| tree | 84b3cb764378b48856d762fc6aaf3457fe0b88aa /dbus | |
| parent | d8dd432f39c560ad58cbb65182d6550013ea85af (diff) | |
2005-06-29 Colin Walters <walters@verbum.org>
* dbus/dbus-glib.h: Delete DBUS_TYPE_G_PROXY_ARRAY. Add
DBUS_TYPE_G_OBJECT_PATH.
* glib/dbus-gvalue.c (dbus_g_value_types_init): Remove marshallers
for G_TYPE_OBJECT and DBUS_TYPE_G_PROXY_ARRAY (the latter should
be handled more generically). Add DBUS_TYPE_G_OBJECT_PATH.
(dbus_g_object_path_get_g_type): New function.
(dbus_gtype_from_signature_iter): Map DBUS_TYPE_OBJECT_PATH
to DBUS_TYPE_G_OBJECT_PATH by default.
(demarshal_proxy): Remove unused name variable.
(demarshal_object_path, marshal_object_path): New functions.
(demarshal_proxy_array, marshal_proxy_array): Delete.
* glib/dbus-binding-tool-glib.c (dbus_g_type_get_c_name): Map
DBUS_TYPE_G_OBJECT_PATH to char *.
(dbus_g_type_get_lookup_function): Map builtin
DBUS_TYPE_G_OBJECT_PATH.
* test/glib/test-dbus-glib.c
* test/glib/test-service-glib.c (my_object_objpath):
Adapt tests to new object path marshalling.
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-glib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h index 901b5720..5e791e01 100644 --- a/dbus/dbus-glib.h +++ b/dbus/dbus-glib.h @@ -177,13 +177,13 @@ typedef struct _DBusGValue DBusGValue; #define DBUS_TYPE_G_STRING_STRING_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING)) -/* D-BUS-specific types */ -#define DBUS_TYPE_G_PROXY_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_PROXY)) - /* 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); |