properties mixin: when SetProperties is called in the middle of an existing SetProperties call, don't trample over the existing state

20070711152100-c9803-ed5c085f1a6f682d015b2282dbf4ea7b9ec8b21f.gz

1 files changed, 3 insertions, 1 deletions

diff --git a/telepathy-glib/properties-mixin.c b/telepathy-glib/properties-mixin.c
index 94d18495f..b19c3acec 100644
--- a/telepathy-glib/properties-mixin.c
+++ b/telepathy-glib/properties-mixin.c
@@ -392,7 +392,9 @@ tp_properties_mixin_set_properties (GObject *obj,
     {
       error = g_error_new (TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
                            "A SetProperties request is already in progress");
-      goto ERROR;
+      dbus_g_method_return_error (context, error);
+      g_error_free (error);
+      return;
     }
 
   ctx->dbus_ctx = context;