# HG changeset patch
# User Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
# Date 1282168808 -7200
# Node ID c72010633a860717785e1f33385445507b5626db
# Parent  2200a1c96af3b0f0a30554ad7cfdaac170036ae7
JFT: cleanup obscur part

diff -r 2200a1c96af3 -r c72010633a86 jingle-ft/filetransfer.c
--- a/jingle-ft/filetransfer.c	Wed Aug 18 23:38:02 2010 +0200
+++ b/jingle-ft/filetransfer.c	Thu Aug 19 00:00:08 2010 +0200
@@ -313,15 +313,16 @@
 
   for (el = info_list; el; el = el->next) {
     JingleFTInfo *jftio = el->data;
-    gchar *strsize = _convert_size(jftio->jft->size);
-    const gchar *dir = (jftio->jft->dir == JINGLE_FT_INCOMING) ? "<==" : "-->";
-    gfloat percent = (gfloat)jftio->jft->transmit/(gfloat)jftio->jft->size*100;
-    const gchar *state = strstate[jftio->jft->state];
-    const gchar *desc = jftio->jft->desc?jftio->jft->desc:"";
+    JingleFT *jft = jftio->jft;
+    gchar *strsize = _convert_size(jft->size);
+    const gchar *dir = (jft->dir == JINGLE_FT_INCOMING) ? "<==" : "-->";
+    gfloat percent = ((gfloat)jft->transmit / (gfloat)jft->size) * 100;
+    const gchar *state = strstate[jft->state];
+    const gchar *desc = jft->desc ? jft->desc : "";
     const gchar *hash = "";
-    if (jftio->jft->dir == JINGLE_FT_INCOMING &&
-        jftio->jft->state == JINGLE_FT_ENDING) {
-      if (_check_hash(jftio->jft->hash,jftio->jft->md5) == FALSE)
+    if (jft->dir == JINGLE_FT_INCOMING &&
+        jft->state == JINGLE_FT_ENDING) {
+      if (_check_hash(jft->hash, jft->md5) == FALSE)
         hash = "corrupt";
       else
         hash = "checked";
@@ -384,6 +385,8 @@
   jft->date = fileinfo.st_mtime;
   jft->size = fileinfo.st_size;
   jft->transmit = 0;
+  jft->hash = NULL;
+  jft->md5 = NULL;
   jft->state = JINGLE_FT_PENDING;
   jft->dir = JINGLE_FT_OUTGOING;
   jft->outfile = g_io_channel_new_file(filename, "r", &err);