[Telepathy-commits] [telepathy-salut/master] Emit "canceled" on the GibberOobFileTransfer object if cancelled.

[Jonny Lamb]

20080805171756-8ed0e-a7aa2731ebe1db77744ee37982df303add28c003.gz
---
 lib/gibber/gibber-oob-file-transfer.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c
index c67fc30..0132cad 100644
--- a/lib/gibber/gibber-oob-file-transfer.c
+++ b/lib/gibber/gibber-oob-file-transfer.c
@@ -663,24 +663,18 @@ gibber_oob_file_transfer_received_stanza (GibberFileTransfer *ft,
     {
       GError *error = NULL;
       const gchar *error_code_str;
-      guint error_code;
-      const gchar *error_descr;
 
       /* FIXME copy the error handling code from gabble */
       error_code_str = gibber_xmpp_node_get_attribute (error_node, "code");
       if (g_ascii_strtoll (error_code_str, NULL, 10) == 406)
         {
-          error_code = GIBBER_FILE_TRANSFER_ERROR_NOT_ACCEPTABLE;
-          error_descr = "Remote user stopped the transfer";
-        }
-      else
-        {
-          error_code = GIBBER_FILE_TRANSFER_ERROR_NOT_FOUND;
-          error_descr = "Remote user is not able to retrieve the file";
+          g_signal_emit_by_name (self, "canceled");
+          return;
         }
 
-      g_set_error (&error, GIBBER_FILE_TRANSFER_ERROR, error_code,
-          error_descr);
+      g_set_error (&error, GIBBER_FILE_TRANSFER_ERROR,
+          GIBBER_FILE_TRANSFER_ERROR_NOT_FOUND,
+          "Remote user is not able to retrieve the file");
       gibber_file_transfer_emit_error (GIBBER_FILE_TRANSFER (self), error);
       return;
     }
-- 
1.5.6.5