From 778579ec214548f4e0daeb7aff7894948bdbf990 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 21 Jun 2005 00:30:20 +0000 Subject: 2005-06-20 Colin Walters * 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. --- doc/dbus-tutorial.xml | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'doc') diff --git a/doc/dbus-tutorial.xml b/doc/dbus-tutorial.xml index 6ee32927..304d0d70 100644 --- a/doc/dbus-tutorial.xml +++ b/doc/dbus-tutorial.xml @@ -769,8 +769,8 @@ main (int argc, char **argv) /* Call ListNames method, wait for reply */ error = NULL; - if (!dbus_g_proxy_invoke (proxy, "ListNames", &error, G_TYPE_INVALID, - G_TYPE_STRV, &name_list, G_TYPE_INVALID)) + if (!dbus_g_proxy_call (proxy, "ListNames", &error, G_TYPE_INVALID, + G_TYPE_STRV, &name_list, G_TYPE_INVALID)) { g_printerr ("Failed to complete ListNames call: %s\n", error->message); @@ -810,7 +810,7 @@ main (int argc, char **argv) Understanding method invocation You have a number of choices for method invocation. First, as - used above, dbus_g_proxy_invoke sends a + used above, dbus_g_proxy_call sends a method call to the remote object, and blocks until reply is recieved. The outgoing arguments are specified in the varargs array, terminated with G_TYPE_INVALID. @@ -845,10 +845,10 @@ main (int argc, char **argv) GArray *arr; error = NULL; - if (!dbus_g_proxy_invoke (proxy, "Foobar", &error, - G_TYPE_INT, 42, G_TYPE_STRING, "hello", - G_TYPE_INVALID, - DBUS_TYPE_G_UCHAR_ARRAY, &arr, G_TYPE_INVALID)) + if (!dbus_g_proxy_call (proxy, "Foobar", &error, + G_TYPE_INT, 42, G_TYPE_STRING, "hello", + G_TYPE_INVALID, + DBUS_TYPE_G_UCHAR_ARRAY, &arr, G_TYPE_INVALID)) { g_printerr ("Failed to complete Foobar: %s\n", error->message); @@ -871,9 +871,9 @@ main (int argc, char **argv) g_hash_table_insert (hash, "baz", "whee"); error = NULL; - if (!dbus_g_proxy_invoke (proxy, "HashSize", &error, - DBUS_TYPE_G_STRING_STRING_HASH, hash, G_TYPE_INVALID, - G_TYPE_UINT, &ret, G_TYPE_INVALID)) + if (!dbus_g_proxy_call (proxy, "HashSize", &error, + DBUS_TYPE_G_STRING_STRING_HASH, hash, G_TYPE_INVALID, + G_TYPE_UINT, &ret, G_TYPE_INVALID)) { g_printerr ("Failed to complete HashSize: %s\n", error->message); @@ -893,11 +893,11 @@ main (int argc, char **argv) char *strret; error = NULL; - if (!dbus_g_proxy_invoke (proxy, "GetStuff", &error, - G_TYPE_INVALID, - G_TYPE_BOOLEAN, &boolret, - G_TYPE_STRING, &strret, - G_TYPE_INVALID)) + if (!dbus_g_proxy_call (proxy, "GetStuff", &error, + G_TYPE_INVALID, + G_TYPE_BOOLEAN, &boolret, + G_TYPE_STRING, &strret, + G_TYPE_INVALID)) { g_printerr ("Failed to complete GetStuff: %s\n", error->message); @@ -927,11 +927,11 @@ main (int argc, char **argv) strs_dynamic[3] = NULL; error = NULL; - if (!dbus_g_proxy_invoke (proxy, "TwoStrArrays", &error, - G_TYPE_STRV, strs_static_p, - G_TYPE_STRV, strs_dynamic, - G_TYPE_INVALID, - G_TYPE_INVALID)) + if (!dbus_g_proxy_call (proxy, "TwoStrArrays", &error, + G_TYPE_STRV, strs_static_p, + G_TYPE_STRV, strs_dynamic, + G_TYPE_INVALID, + G_TYPE_INVALID)) { g_printerr ("Failed to complete TwoStrArrays: %s\n", error->message); @@ -952,11 +952,11 @@ main (int argc, char **argv) error = NULL; blah = TRUE; - if (!dbus_g_proxy_invoke (proxy, "GetStrs", &error, - G_TYPE_BOOLEAN, blah, - G_TYPE_INVALID, - G_TYPE_STRV, &strs, - G_TYPE_INVALID)) + if (!dbus_g_proxy_call (proxy, "GetStrs", &error, + G_TYPE_BOOLEAN, blah, + G_TYPE_INVALID, + G_TYPE_STRV, &strs, + G_TYPE_INVALID)) { g_printerr ("Failed to complete GetStrs: %s\n", error->message); @@ -979,9 +979,9 @@ main (int argc, char **argv) g_value_set_string (&val, "hello world"); error = NULL; - if (!dbus_g_proxy_invoke (proxy, "SendVariant", &error, - G_TYPE_VALUE, &val, G_TYPE_INVALID, - G_TYPE_INVALID)) + if (!dbus_g_proxy_call (proxy, "SendVariant", &error, + G_TYPE_VALUE, &val, G_TYPE_INVALID, + G_TYPE_INVALID)) { g_printerr ("Failed to complete SendVariant: %s\n", error->message); @@ -1000,8 +1000,8 @@ main (int argc, char **argv) GValue val = {0, }; error = NULL; - if (!dbus_g_proxy_invoke (proxy, "GetVariant", &error, G_TYPE_INVALID, - G_TYPE_VALUE, &val, G_TYPE_INVALID)) + if (!dbus_g_proxy_call (proxy, "GetVariant", &error, G_TYPE_INVALID, + G_TYPE_VALUE, &val, G_TYPE_INVALID)) { g_printerr ("Failed to complete GetVariant: %s\n", error->message); -- cgit