dbus/test/glib test-dbus-glib.c,1.18,1.19

[Colin Walters]

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

Modified Files:
	test-dbus-glib.c 
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: test-dbus-glib.c
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-dbus-glib.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- test-dbus-glib.c	17 Jun 2005 14:29:48 -0000	1.18
+++ test-dbus-glib.c	21 Jun 2005 00:30:20 -0000	1.19
@@ -268,14 +268,14 @@
   /* Activate test servie */ 
   g_print ("Activating TestSuiteGLibService\n");
   error = NULL;
-  if (!dbus_g_proxy_invoke (driver, "StartServiceByName", &error,
-			    G_TYPE_STRING,
-			    "org.freedesktop.DBus.TestSuiteGLibService",
-			    G_TYPE_UINT,
-			    0,
-			    G_TYPE_INVALID,
-			    G_TYPE_UINT, &result,
-			    G_TYPE_INVALID)) {
+  if (!dbus_g_proxy_call (driver, "StartServiceByName", &error,
+			  G_TYPE_STRING,
+			  "org.freedesktop.DBus.TestSuiteGLibService",
+			  G_TYPE_UINT,
+			  0,
+			  G_TYPE_INVALID,
+			  G_TYPE_UINT, &result,
+			  G_TYPE_INVALID)) {
     lose_gerror ("Failed to complete Activate call", error);
   }
 
@@ -304,11 +304,11 @@
     lose_gerror ("Failed to complete DoNothing call", error);
 
   error = NULL;
-  if (!dbus_g_proxy_invoke (proxy, "Increment", &error,
-			    G_TYPE_UINT, 42,
-			    G_TYPE_INVALID,
-			    G_TYPE_UINT, &v_UINT32_2,
-			    G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "Increment", &error,
+			  G_TYPE_UINT, 42,
+			  G_TYPE_INVALID,
+			  G_TYPE_UINT, &v_UINT32_2,
+			  G_TYPE_INVALID))
     lose_gerror ("Failed to complete Increment call", error);
 
   if (v_UINT32_2 != 43)
@@ -678,8 +678,8 @@
                                G_CALLBACK (frobnicate_signal_handler),
                                NULL, NULL);
   
-  if (!dbus_g_proxy_invoke (proxy, "EmitFrobnicate", &error,
-			    G_TYPE_INVALID, G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "EmitFrobnicate", &error,
+			  G_TYPE_INVALID, G_TYPE_INVALID))
     lose_gerror ("Failed to complete EmitFrobnicate call", error);
 
   
@@ -690,8 +690,8 @@
   if (n_times_frobnicate_received != 1)
     lose ("Frobnicate signal received %d times, should have been 1", n_times_frobnicate_received);
 
-  if (!dbus_g_proxy_invoke (proxy, "EmitFrobnicate", &error,
-			    G_TYPE_INVALID, G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (proxy, "EmitFrobnicate", &error,
+			  G_TYPE_INVALID, G_TYPE_INVALID))
     lose_gerror ("Failed to complete EmitFrobnicate call", error);
   
   dbus_g_connection_flush (connection);