GabbleConnection: fixed room_jid_disco_cb to return proper Telepathy error, and not doubly free error and batch context

20061014211045-01440-120eeccbf6bae4572cb0af19673cf269ebcfa317.gz

1 files changed, 8 insertions, 2 deletions

diff --git a/src/gabble-connection.c b/src/gabble-connection.c
index 0ee8cdda2..adf88455c 100644
--- a/src/gabble-connection.c
+++ b/src/gabble-connection.c
@@ -4229,8 +4229,14 @@ room_jid_disco_cb (GabbleDisco *disco,
   if (error != NULL)
     {
       DEBUG ("disco reply error %s", error->message);
-      room_verify_batch_raise_error(batch, error);
-      goto OUT;
+
+      /* disco will free the old error, _raise_error will free the new one */
+      error = g_error_new (TELEPATHY_ERRORS, NotAvailable,
+        "can't retrieve room info: %s", error->message);
+
+      room_verify_batch_raise_error (batch, error);
+
+      return;
     }
 
   for (lm_node = query_result->children; lm_node; lm_node = lm_node->next)