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 /test/glib/test-service-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 'test/glib/test-service-glib.c')
| -rw-r--r-- | test/glib/test-service-glib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/glib/test-service-glib.c b/test/glib/test-service-glib.c index 315f1d65..9d5dfcc8 100644 --- a/test/glib/test-service-glib.c +++ b/test/glib/test-service-glib.c @@ -61,7 +61,7 @@ gboolean my_object_many_return (MyObject *obj, guint32 *arg0, char **arg1, gint3 gboolean my_object_recursive1 (MyObject *obj, GArray *array, guint32 *len_ret, GError **error); gboolean my_object_recursive2 (MyObject *obj, guint32 reqlen, GArray **array, GError **error); -gboolean my_object_objpath (MyObject *obj, GObject *in, GObject **arg1, GError **error); +gboolean my_object_objpath (MyObject *obj, const char *in, char **arg1, GError **error); gboolean my_object_stringify (MyObject *obj, GValue *value, char **ret, GError **error); gboolean my_object_unstringify (MyObject *obj, const char *str, GValue *value, GError **error); @@ -362,9 +362,9 @@ my_object_many_uppercase (MyObject *obj, const char * const *in, char ***out, GE } gboolean -my_object_objpath (MyObject *obj, GObject *incoming, GObject **outgoing, GError **error) +my_object_objpath (MyObject *obj, const char *incoming, char **outgoing, GError **error) { - if ((GObject*) obj != incoming) + if (strcmp (incoming, "/org/freedesktop/DBus/Tests/MyTestObject")) { g_set_error (error, MY_OBJECT_ERROR, @@ -372,7 +372,7 @@ my_object_objpath (MyObject *obj, GObject *incoming, GObject **outgoing, GError "invalid incoming object"); return FALSE; } - *outgoing = g_object_ref (obj2); + *outgoing = g_strdup ("/org/freedesktop/DBus/Tests/MyTestObject2"); return TRUE; } |