Remove use of deprecated functions

1 files changed, 28 insertions, 39 deletions

diff --git a/examples/test-raw.c b/examples/test-raw.c
index 3be6680..5ca2e2a 100644
--- a/examples/test-raw.c
+++ b/examples/test-raw.c
@@ -2,15 +2,16 @@
 #include <unistd.h>
 
 static void
-proxy_call_raw_async_cb (RestProxy *proxy,
-                         guint status_code,
-                         const gchar *response_message,
-                         GHashTable *headers,
-                         const gchar *payload,
-                         gssize len,
-                         GObject *weak_object,
-                         gpointer userdata)
+proxy_call_async_cb (RestProxyCall *call,
+                     GError        *error,
+                     GObject       *weak_object,
+                     gpointer       userdata)
 {
+  const gchar *payload;
+  goffset len;
+
+  payload = rest_proxy_call_get_payload (call);
+  len = rest_proxy_call_get_payload_length (call);
   write (1, payload, len);
   g_main_loop_quit ((GMainLoop *)userdata);
 }
@@ -19,8 +20,9 @@ gint
 main (gint argc, gchar **argv)
 {
   RestProxy *proxy;
+  RestProxyCall *call;
   GMainLoop *loop;
-  gchar *payload;
+  const gchar *payload;
   gssize len;
 
   g_type_init ();
@@ -29,39 +31,26 @@ main (gint argc, gchar **argv)
   loop = g_main_loop_new (NULL, FALSE);
 
   proxy = rest_proxy_new ("http://www.flickr.com/services/rest/", FALSE);
-  rest_proxy_call_raw_async (proxy,
-      NULL,
-      "GET",
-      proxy_call_raw_async_cb,
-      NULL,
-      loop,
-      NULL,
-      "method",
-      "flickr.test.echo",
-      "api_key",
-      "314691be2e63a4d58994b2be01faacfb",
-      "format",
-      "json",
-      NULL);
+  call = rest_proxy_new_call (proxy);
+  rest_proxy_call_add_params (call,
+                              "method", "flickr.test.echo",
+                              "api_key", "314691be2e63a4d58994b2be01faacfb",
+                              "format", "json",
+                              NULL);
+  rest_proxy_call_async (call, 
+                         proxy_call_async_cb,
+                         NULL,
+                         loop,
+                         NULL);
 
   g_main_loop_run (loop);
 
-  rest_proxy_run_raw (proxy,
-      NULL,
-      "GET",
-      NULL,
-      NULL,
-      NULL,
-      &payload,
-      &len,
-      NULL,
-      "method",
-      "flickr.test.echo",
-      "api_key",
-      "314691be2e63a4d58994b2be01faacfb",
-      "format",
-      "json",
-      NULL);
+  rest_proxy_call_run (call, NULL, NULL);
 
+  payload = rest_proxy_call_get_payload (call);
+  len = rest_proxy_call_get_payload_length (call);
   write (1, payload, len);
+
+  g_object_unref (call);
+  g_object_unref (proxy);
 }