[Telepathy-commits] [telepathy-salut/master] salut_file_transfer_channel_offer_file: pass another GError to salut_xmpp_connection_manager_request_connection so we don't re-set it if something goes wrong

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Wed Dec 10 04:20:50 PST 2008


---
 src/salut-file-transfer-channel.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/salut-file-transfer-channel.c b/src/salut-file-transfer-channel.c
index d97c12c..9870c3f 100644
--- a/src/salut-file-transfer-channel.c
+++ b/src/salut-file-transfer-channel.c
@@ -1215,6 +1215,7 @@ salut_file_transfer_channel_offer_file (SalutFileTransferChannel *self,
 {
   SalutXmppConnectionManagerRequestConnectionResult request_result;
   GibberXmppConnection *connection = NULL;
+  GError *e = NULL;
 
   g_assert (!CHECK_STR_EMPTY (self->priv->filename));
   g_assert (self->priv->size != SALUT_UNDEFINED_FILE_SIZE);
@@ -1223,7 +1224,7 @@ salut_file_transfer_channel_offer_file (SalutFileTransferChannel *self,
 
   request_result = salut_xmpp_connection_manager_request_connection (
       self->priv->xmpp_connection_manager, self->priv->contact,
-      &connection, error);
+      &connection, &e);
 
   if (request_result ==
       SALUT_XMPP_CONNECTION_MANAGER_REQUEST_CONNECTION_RESULT_DONE)
@@ -1242,7 +1243,8 @@ salut_file_transfer_channel_offer_file (SalutFileTransferChannel *self,
     {
       DEBUG ("Request connection failed");
       g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR,
-        "Request connection failed");
+        "Request connection failed: %s", e->message);
+      g_error_free (e);
       return FALSE;
     }
 
-- 
1.5.6.5



More information about the Telepathy-commits mailing list