diff options
| author | Colin Walters <walters@verbum.org> | 2005-06-21 00:30:20 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-06-21 00:30:20 +0000 |
| commit | 778579ec214548f4e0daeb7aff7894948bdbf990 (patch) | |
| tree | 148813bb5e66299f5149fa45719b71669a850e20 /glib | |
| parent | 7883563478cefd0eb7a4f4466904dcec46db6d8d (diff) | |
2005-06-20 Colin Walters <walters@verbum.org>
* dbus/dbus-glib.h:
* glib/dbus-gproxy.c: Rename dbus_g_proxy_invoke to
dbus_g_proxy_call.
* glib/dbus-binding-tool-glib.c:
* doc/dbus-tutorial.xml:
* test/glib/test-dbus-glib.c: Update for rename.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/dbus-binding-tool-glib.c | 2 | ||||
| -rw-r--r-- | glib/dbus-gproxy.c | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/glib/dbus-binding-tool-glib.c b/glib/dbus-binding-tool-glib.c index fd849a86..373faaff 100644 --- a/glib/dbus-binding-tool-glib.c +++ b/glib/dbus-binding-tool-glib.c @@ -1333,7 +1333,7 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error WRITE_OR_LOSE ("{\n"); - if (!write_printf_to_iochannel (" return dbus_g_proxy_invoke (proxy, \"%s\", ", channel, error, + if (!write_printf_to_iochannel (" return dbus_g_proxy_call (proxy, \"%s\", ", channel, error, method_info_get_name (method))) goto io_lose; diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c index 143b9a2b..f4fcc31f 100644 --- a/glib/dbus-gproxy.c +++ b/glib/dbus-gproxy.c @@ -1592,9 +1592,11 @@ dbus_g_proxy_end_call (DBusGProxy *proxy, } /** - * Function for invoking a method and receiving reply values. - * Normally this is not used directly - calls to it are generated - * from client-side wrappers (see dbus-binding-tool). + * Function for synchronously invoking a method and receiving reply + * values. This function is equivalent to dbus_g_proxy_begin_call + * followed by dbus_g_proxy_end_call. All of the input arguments are + * specified first, followed by G_TYPE_INVALID, followed by all of the + * output values, followed by G_TYPE_INVALID. * * @param proxy a proxy for a remote interface * @param method method to invoke @@ -1603,11 +1605,11 @@ dbus_g_proxy_end_call (DBusGProxy *proxy, * @returns #FALSE if an error is set, TRUE otherwise */ gboolean -dbus_g_proxy_invoke (DBusGProxy *proxy, - const char *method, - GError **error, - GType first_arg_type, - ...) +dbus_g_proxy_call (DBusGProxy *proxy, + const char *method, + GError **error, + GType first_arg_type, + ...) { gboolean ret; DBusGPendingCall *pending; |