[librest/xml: 1/4] rest-proxy-call: don't unset ->url straight away

[Ross Burton <rburton src gnome org>]

commit 0b554e605b50562b3e6af066ef4d7687993fe62f
Author: Ross Burton <ross linux intel com>
Date:   Thu Aug 12 12:14:01 2010 +0100

    rest-proxy-call: don't unset ->url straight away

 rest/rest-proxy-call.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/rest/rest-proxy-call.c b/rest/rest-proxy-call.c
index efd8a05..22d78cd 100644
--- a/rest/rest-proxy-call.c
+++ b/rest/rest-proxy-call.c
@@ -135,6 +135,7 @@ rest_proxy_call_finalize (GObject *object)
 
   g_free (priv->method);
   g_free (priv->function);
+  g_free (priv->url);
 
   g_free (priv->payload);
   g_free (priv->status_message);
@@ -720,6 +721,7 @@ prepare_message (RestProxyCall *call, GError **error_out)
     return FALSE;
   }
 
+  g_free (priv->url);
   /* FIXME: Perhaps excessive memory duplication */
   if (priv->function)
   {
@@ -839,7 +841,7 @@ rest_proxy_call_async (RestProxyCall                *call,
 
   message = prepare_message (call, error);
   if (message == NULL)
-    goto error;
+    return FALSE;
 
   closure = g_slice_new0 (RestProxyCallAsyncClosure);
   closure->call = g_object_ref (call);
@@ -862,14 +864,7 @@ rest_proxy_call_async (RestProxyCall                *call,
                              message,
                              _call_message_completed_cb,
                              closure);
-  g_free (priv->url);
-  priv->url = NULL;
   return TRUE;
-
-error:
-  g_free (priv->url);
-  priv->url = NULL;
-  return FALSE;
 }
 
 static void