dbus/doc dbus-tutorial.xml,1.11,1.12

Colin Walters walters at freedesktop.org
Mon Jun 20 17:30:22 PDT 2005


Update of /cvs/dbus/dbus/doc
In directory gabe:/tmp/cvs-serv9204/doc

Modified Files:
	dbus-tutorial.xml 
Log Message:
2005-06-20  Colin Walters  <walters at 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.


Index: dbus-tutorial.xml
===================================================================
RCS file: /cvs/dbus/dbus/doc/dbus-tutorial.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbus-tutorial.xml	13 Jun 2005 03:01:26 -0000	1.11
+++ dbus-tutorial.xml	21 Jun 2005 00:30:20 -0000	1.12
@@ -769,8 +769,8 @@
 
   /* Call ListNames method, wait for reply */
   error = NULL;
-  if (!dbus_g_proxy_invoke (proxy, "ListNames", &amp;error, G_TYPE_INVALID,
-                            G_TYPE_STRV, &amp;name_list, G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "ListNames", &amp;error, G_TYPE_INVALID,
+                          G_TYPE_STRV, &amp;name_list, G_TYPE_INVALID))
     {
       g_printerr ("Failed to complete ListNames call: %s\n",
                   error-&gt;message);
@@ -810,7 +810,7 @@
       <title>Understanding method invocation</title>
       <para>
 	You have a number of choices for method invocation.  First, as
-	used above, <literal>dbus_g_proxy_invoke</literal> sends a
+	used above, <literal>dbus_g_proxy_call</literal> 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 <literal>G_TYPE_INVALID</literal>.
@@ -845,10 +845,10 @@
   GArray *arr;
   
   error = NULL;
-  if (!dbus_g_proxy_invoke (proxy, "Foobar", &amp;error,
-                            G_TYPE_INT, 42, G_TYPE_STRING, "hello",
-			    G_TYPE_INVALID,
-			    DBUS_TYPE_G_UCHAR_ARRAY, &amp;arr, G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "Foobar", &amp;error,
+                          G_TYPE_INT, 42, G_TYPE_STRING, "hello",
+			  G_TYPE_INVALID,
+			  DBUS_TYPE_G_UCHAR_ARRAY, &amp;arr, G_TYPE_INVALID))
     {
       g_printerr ("Failed to complete Foobar: %s\n",
                   error-&gt;message);
@@ -871,9 +871,9 @@
   g_hash_table_insert (hash, "baz", "whee");
 
   error = NULL;
-  if (!dbus_g_proxy_invoke (proxy, "HashSize", &amp;error,
-                            DBUS_TYPE_G_STRING_STRING_HASH, hash, G_TYPE_INVALID,
-			    G_TYPE_UINT, &amp;ret, G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "HashSize", &amp;error,
+                          DBUS_TYPE_G_STRING_STRING_HASH, hash, G_TYPE_INVALID,
+			  G_TYPE_UINT, &amp;ret, G_TYPE_INVALID))
     {
       g_printerr ("Failed to complete HashSize: %s\n",
                   error-&gt;message);
@@ -893,11 +893,11 @@
   char *strret;
   
   error = NULL;
-  if (!dbus_g_proxy_invoke (proxy, "GetStuff", &amp;error,
-			    G_TYPE_INVALID,
-                            G_TYPE_BOOLEAN, &amp;boolret,
-                            G_TYPE_STRING, &amp;strret,
-			    G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "GetStuff", &amp;error,
+			  G_TYPE_INVALID,
+                          G_TYPE_BOOLEAN, &amp;boolret,
+                          G_TYPE_STRING, &amp;strret,
+			  G_TYPE_INVALID))
     {
       g_printerr ("Failed to complete GetStuff: %s\n",
                   error-&gt;message);
@@ -927,11 +927,11 @@
   strs_dynamic[3] = NULL;
   
   error = NULL;
-  if (!dbus_g_proxy_invoke (proxy, "TwoStrArrays", &amp;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", &amp;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-&gt;message);
@@ -952,11 +952,11 @@
 
   error = NULL;
   blah = TRUE;
-  if (!dbus_g_proxy_invoke (proxy, "GetStrs", &amp;error,
-                            G_TYPE_BOOLEAN, blah,
-			    G_TYPE_INVALID,
-                            G_TYPE_STRV, &amp;strs,
-			    G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "GetStrs", &amp;error,
+                          G_TYPE_BOOLEAN, blah,
+			  G_TYPE_INVALID,
+                          G_TYPE_STRV, &amp;strs,
+			  G_TYPE_INVALID))
     {
       g_printerr ("Failed to complete GetStrs: %s\n",
                   error-&gt;message);
@@ -979,9 +979,9 @@
   g_value_set_string (&amp;val, "hello world");
   
   error = NULL;
-  if (!dbus_g_proxy_invoke (proxy, "SendVariant", &amp;error,
-                            G_TYPE_VALUE, &amp;val, G_TYPE_INVALID,
-			    G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "SendVariant", &amp;error,
+                          G_TYPE_VALUE, &amp;val, G_TYPE_INVALID,
+			  G_TYPE_INVALID))
     {
       g_printerr ("Failed to complete SendVariant: %s\n",
                   error-&gt;message);
@@ -1000,8 +1000,8 @@
   GValue val = {0, };
 
   error = NULL;
-  if (!dbus_g_proxy_invoke (proxy, "GetVariant", &amp;error, G_TYPE_INVALID,
-                            G_TYPE_VALUE, &amp;val, G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "GetVariant", &amp;error, G_TYPE_INVALID,
+                          G_TYPE_VALUE, &amp;val, G_TYPE_INVALID))
     {
       g_printerr ("Failed to complete GetVariant: %s\n",
                   error-&gt;message);



More information about the dbus-commit mailing list