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 /glib/dbus-binding-tool-glib.c | |
| 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 'glib/dbus-binding-tool-glib.c')
| -rw-r--r-- | glib/dbus-binding-tool-glib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/glib/dbus-binding-tool-glib.c b/glib/dbus-binding-tool-glib.c index 373faaff..4a33176b 100644 --- a/glib/dbus-binding-tool-glib.c +++ b/glib/dbus-binding-tool-glib.c @@ -98,7 +98,8 @@ dbus_g_type_get_c_name (GType gtype) if (dbus_g_type_is_map (gtype)) return "GHashTable"; - if (g_type_is_a (gtype, G_TYPE_STRING)) + if (g_type_is_a (gtype, G_TYPE_STRING) + || g_type_is_a (gtype, DBUS_TYPE_G_OBJECT_PATH)) return "char *"; /* This one is even more hacky...we get an extra * @@ -892,7 +893,7 @@ dbus_g_type_get_lookup_function (GType gtype) MAP_KNOWN(G_TYPE_VALUE); MAP_KNOWN(G_TYPE_STRV); MAP_KNOWN(DBUS_TYPE_G_PROXY); - MAP_KNOWN(DBUS_TYPE_G_PROXY_ARRAY); + MAP_KNOWN(DBUS_TYPE_G_OBJECT_PATH); return NULL; } #undef MAP_FUNDAMENTAL |