--- a/jingle-filetransfer/filetransfer.c	Sun Aug 15 11:42:10 2010 +0200
+++ b/jingle-filetransfer/filetransfer.c	Sun Aug 15 16:37:32 2010 +0200
@@ -207,18 +207,37 @@
   if (jft->outfile == NULL) {
     jft->outfile = g_io_channel_new_file(jft->name, "w", &err);
     if (jft->outfile == NULL || err != NULL) {
-      // propagate the GError ?
+      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: %s %s", err->message,
+                   jft->name);
+    //TODO: propagate the GError ?
+      g_error_free(err);
       return FALSE;
 	}
-	g_io_channel_set_encoding(jft->outfile, NULL, NULL);
+	status = g_io_channel_set_encoding(jft->outfile, NULL, &err);
+	if (status != G_IO_STATUS_NORMAL || err != NULL) {
+     scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: %s %s", err->message,
+                  jft->name);
+     g_error_free(err);
+     return FALSE;
+   }
   }
 
   status = g_io_channel_write_chars(jft->outfile, data, (gssize) len,
                                     &bytes_written, &err);
-  g_io_channel_flush(jft->outfile, NULL);
   if (status != G_IO_STATUS_NORMAL || err != NULL) {
+     scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: %s %s", err->message,
+                  jft->name);
+    g_error_free(err);
     return FALSE;
   }
+  status = g_io_channel_flush(jft->outfile, &err);
+  if (status != G_IO_STATUS_NORMAL || err != NULL) {
+    scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: %s %s", err->message,
+                 jft->name);
+    g_error_free(err);
+    return FALSE;
+  }
+
   if (bytes_written != len) {
     // not supposed to happen if status is normal, unless outfile is non-blocking
     return FALSE;
@@ -259,7 +278,8 @@
     const gchar *namespaces[] = {NS_JINGLE, NS_JINGLE_APP_FT, NULL};
     const gchar *myjid = g_strdup(lm_connection_get_jid(lconnection));
     JingleFT *jft = g_new0(JingleFT, 1);
-
+    GError *err = NULL;
+    
     if (CURRENT_JID == NULL) { // CURRENT_JID = the jid of the user which has focus
       scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: Please, choose a valid JID in the roster");
       return;
@@ -280,13 +300,21 @@
     jft->name = g_path_get_basename(filename);
     jft->date = fileinfo.st_mtime;
     jft->size = fileinfo.st_size;
-    jft->outfile = g_io_channel_new_file (filename, "r", NULL);
-    if (jft->outfile == NULL) {
-      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: Cannot open file %s", args[1]);
+    jft->outfile = g_io_channel_new_file (filename, "r", &err);
+    if (jft->outfile == NULL || err != NULL) {
+      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: %s %s", err->message,
+                   args[1]);
+      g_error_free(err);
       return;
     }
     
-    g_io_channel_set_encoding(jft->outfile, NULL, NULL);
+    g_io_channel_set_encoding(jft->outfile, NULL, &err);
+    if (jft->outfile == NULL || err != NULL) {
+      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: %s %s", err->message,
+                   args[1]);
+      g_error_free(err);
+      return;
+    }
     
     session_add_app(sess, "file", NS_JINGLE_APP_FT, jft);
 
@@ -319,8 +347,10 @@
 
   size = g_strdup_printf("%" G_GUINT64_FORMAT, jft->size);
   
-  lm_message_node_set_attributes(node2, "xmlns", NS_SI_FT, "name", jft->name,
-                                 "size", size, NULL);
+  lm_message_node_set_attributes(node2, "xmlns", NS_SI_FT,
+                                 "name", jft->name,
+                                 "size", size,
+                                 NULL);
   g_free(size);
   
   if (jft->hash != NULL)
@@ -339,12 +369,18 @@
 static void send_hash(gchar *sid, gchar *to, gchar *hash)
 {
   JingleAckHandle *ackhandle;
+  GError *err = NULL;
+  gboolean ret;
   
-  LmMessage *r = lm_message_new_with_sub_type(to, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_SET);
+  LmMessage *r = lm_message_new_with_sub_type(to, LM_MESSAGE_TYPE_IQ,
+                                              LM_MESSAGE_SUB_TYPE_SET);
   LmMessageNode *node = lm_message_get_node(r);
   lm_message_node_add_child(node, "jingle", NULL);
   node = lm_message_node_get_child(node, "jingle");
-  lm_message_node_set_attributes(node, "xmlns", NS_JINGLE, "sid", sid, "action", "session-info", NULL);
+  lm_message_node_set_attributes(node, "xmlns", NS_JINGLE,
+                                 "sid", sid,
+                                 "action", "session-info",
+                                 NULL);
   lm_message_node_add_child(node, "hash", hash);
   node = lm_message_node_get_child(node, "hash");
   lm_message_node_set_attribute(node, "xmlns", NS_JINGLE_APP_FT_INFO);
@@ -353,8 +389,16 @@
   ackhandle->callback = NULL;
   ackhandle->user_data = NULL;
   
-  lm_connection_send_with_reply(lconnection, r,
-                                jingle_new_ack_handler(ackhandle), NULL);
+  ret = lm_connection_send_with_reply(lconnection, r,
+                                      jingle_new_ack_handler(ackhandle), &err);
+  
+  // It's not really a problem, but we must tell it!
+  if (ret == FALSE || err != NULL) {
+    scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: cannot send hash: %s",
+                 err->message);
+    g_error_free(err);
+  }
+  
   lm_message_unref(r);
 }
 
@@ -365,6 +409,8 @@
   gsize read;
   GIOStatus status;
   int count = 0;
+  GError *err = NULL;
+  
   JingleSession *sess = session_find_by_sid(sc->sid, sc->from);
   if (sess == NULL) {
     scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: error before transfer");
@@ -378,17 +424,19 @@
   
   do {
     count++;
-    status = g_io_channel_read_chars(jft->outfile, (gchar*)buf, JINGLE_FT_SIZE_READ, &read, NULL);
+    status = g_io_channel_read_chars(jft->outfile, (gchar*)buf,
+                                     JINGLE_FT_SIZE_READ, &read, &err);
   } while (status == G_IO_STATUS_AGAIN && count < 10);
-  
+
   if (status == G_IO_STATUS_AGAIN) {
     // TODO: something better
     scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: file unavailable");
     return;
   }
   
-  if (status == G_IO_STATUS_ERROR) {
-    scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: an error occured");
+  if (status == G_IO_STATUS_ERROR || err != NULL) {
+    scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: %s", err->message);
+    g_error_free(err);
     return;
   }
   
@@ -400,10 +448,12 @@
   
   if (status == G_IO_STATUS_EOF) {
     handle_app_data(sc->sid, sc->from, sc->name, NULL, 0);
-    scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: transfer finish (%s)", jft->name);
+    scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: transfer finish (%s)",
+                 jft->name);
     jft->hash = g_strdup(g_checksum_get_string(jft->md5));
     // Call a function to say state is ended
-    session_changestate_sessioncontent(sess, sc2->name, JINGLE_SESSION_STATE_ENDED);
+    session_changestate_sessioncontent(sess, sc2->name, 
+                                       JINGLE_SESSION_STATE_ENDED);
     // Send the hash
     send_hash(sess->sid, sess->to, jft->hash);
     g_checksum_free(jft->md5);
@@ -441,24 +491,34 @@
 static void stop(gconstpointer data)
 {
   JingleFT *jft = (JingleFT*)data;
+  GError *err = NULL;
+  GIOStatus status;
+  
+  if (jft->outfile != NULL) {
+    status = g_io_channel_flush(jft->outfile, &err);
+    if (status != G_IO_STATUS_NORMAL || err != NULL) {
+      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: %s",
+                   err->message);
+      g_error_free(err);
+    }
+    g_io_channel_unref(jft->outfile);
+  }
 
   if (jft->hash != NULL && jft->md5 != NULL) {
     if (g_strcmp0(jft->hash, g_checksum_get_string(jft->md5))) {
-      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: File corrupt (%s)", jft->name);
+      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: File corrupt (%s)",
+                   jft->name);
     } else {
-      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: transfer finished (%s) and verified", jft->name);
+      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: transfer finished (%s)"
+                   " and verified", jft->name);
     }
   } else {
-    scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: transfer finished (%s) but not verified", jft->name);
+    scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: transfer finished (%s)"
+                 " but not verified", jft->name);
   }
 
   g_checksum_free(jft->md5);
 
-  if (jft->outfile != NULL) {
-    g_io_channel_flush(jft->outfile, NULL);
-
-    g_io_channel_unref(jft->outfile);
-  }
 }
 
 static void jingle_ft_init(void)

--- a/jingle-ibb/ibb.c	Sun Aug 15 11:42:10 2010 +0200
+++ b/jingle-ibb/ibb.c	Sun Aug 15 16:37:32 2010 +0200
@@ -46,6 +46,7 @@
 static const gchar* xmlns(void);
 static gconstpointer new(void);
 static void send(session_content *sc, gconstpointer data, gchar *buf, gsize size);
+static void init(session_content *sc, gconstpointer data);
 static void end(session_content *sc, gconstpointer data);
 static void _send_internal(session_content *sc, const gchar *to, gchar *buf,
                            gsize size, const gchar *sid, gint64 *seq);
@@ -65,6 +66,7 @@
   .cmp       = cmp,
   .new       = new,
   .send      = send,
+  .init      = init,
   .end       = end
 };
 
@@ -105,8 +107,14 @@
   
   ibb->blocksize = g_ascii_strtoll(blocksize, NULL, 10);
 
-  // the size attribute is a xs:short an therefore can be negative.
-  if (ibb->blocksize < 0 || ibb->blocksize > IBB_BLOCK_SIZE_MAX) {
+  // If block size is too big, we change it
+  if (ibb->blocksize > IBB_BLOCK_SIZE_MAX) {
+    ibb->blocksize = IBB_BLOCK_SIZE_MAX;
+    return NULL;
+  }
+  ibb->blocksize = 2048;
+  // the blocksize attribute is a xs:short an therefore can be negative.
+  if (ibb->blocksize < 0) {
     g_set_error(err, JINGLE_CHECK_ERROR, JINGLE_CHECK_ERROR_BADVALUE,
                 "block-size is negative");
     g_free(ibb->sid);
@@ -310,6 +318,16 @@
   }
 }
 
+static void init(session_content *sc, gconstpointer data)
+{
+  JingleIBB *jibb = (JingleIBB*)data;
+  JingleSession *sess = session_find_by_sid(sc->sid, sc->from);
+  SessionContent *sc2 = session_find_sessioncontent(sess, sc->name);
+  JingleIBB *jibb2 = (JingleIBB*)sc2->transport;
+  
+  jibb2->blocksize = (jibb->blocksize < jibb2->blocksize)?jibb->blocksize:jibb2->blocksize;
+}
+
 static void end(session_content *sc, gconstpointer data)
 {
   JingleIBB *jibb = (JingleIBB*)data;

--- a/jingle/action-handlers.c	Sun Aug 15 11:42:10 2010 +0200
+++ b/jingle/action-handlers.c	Sun Aug 15 16:37:32 2010 +0200
@@ -58,7 +58,6 @@
   if (!roster_find(disp, jidsearch, 0)) {
     // We say that we doesn't support jingle.
     jingle_send_iq_error(jn->message, "cancel", "service-unavailable", NULL);
-    jingle_free_jinglenode(jn);
     g_free(disp);
     return;
   }
@@ -67,7 +66,6 @@
     scr_log_print(LPRINT_DEBUG, "jingle: One of the content element was invalid (%s)",
                   err->message);
     jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
-    jingle_free_jinglenode(jn);
     g_free(disp);
     return;
   }
@@ -75,7 +73,6 @@
   // a session-initiate message must contains at least one <content> element
   if (g_slist_length(jn->content) < 1) {
     jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
-    jingle_free_jinglenode(jn);
     g_free(disp);
     return;
   }
@@ -92,7 +89,6 @@
   if (!valid_disposition) {
     jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
     g_free(disp);
-    jingle_free_jinglenode(jn);
     return;  
   }
   
@@ -100,7 +96,6 @@
   if (session_find(jn) != NULL) {
     jingle_send_iq_error(jn->message, "cancel", "unexpected-request", "out-of-order");
     g_free(disp);
-    jingle_free_jinglenode(jn);
     return;
   }
 
@@ -158,7 +153,6 @@
     scr_LogPrint(LPRINT_LOGNORM, "%s", sbuf->str);
   }
   g_free(disp);
-  jingle_free_jinglenode(jn);
 }
 
 void handle_session_info(JingleNode *jn)
@@ -201,7 +195,6 @@
    * error condition of <unsupported-info/>." */
   jingle_send_iq_error(jn->message, "modify", "feature-not-implemented",
                        "unsupported-info");
-  jingle_free_jinglenode(jn);
 }
 
 void handle_session_accept(JingleNode *jn)
@@ -210,7 +203,7 @@
   JingleContent *jc;
   SessionContent *sc;
   session_content *sc2 = g_new0(session_content, 1);
-  
+  GError *err;
   GSList *el;
   const gchar *from = lm_message_get_from(jn->message);
   
@@ -220,33 +213,44 @@
     jingle_send_iq_error(jn->message, "cancel", "item-not-found", "unknown-session");
     return;
   }
+ 
+  if (!check_contents(jn, &err)) {
+    scr_log_print(LPRINT_DEBUG, "jingle: One of the content element was invalid (%s)",
+                  err->message);
+    jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
+    return;
+  }
   
   jingle_ack_iq(jn->message);
   
+  sc2->sid  = sess->sid;
+  sc2->from = (sess->origin == JINGLE_SESSION_INCOMING) ? sess->from : sess->to;
+
+  // TODO: it's really bad done!
   for (el = jn->content; el; el = el->next) {
     jc = (JingleContent*)el->data;
+    sc2->name = jc->name;
+    sc = session_find_sessioncontent(sess, jc->name);
     session_changestate_sessioncontent(sess, jc->name,
                                        JINGLE_SESSION_STATE_ACTIVE);
+    sc->transfuncs->init(sc2, sc->transfuncs->check(jc, NULL));
   }
   
-  // We delete content who have been refuse
-  /*for (el = sess->content; el; el = el->next) {
+  // We delete content who haven't been accepted
+  for (el = sess->content; el; el = el->next) {
     sc = (SessionContent*) el->data;
     if (sc->state == JINGLE_SESSION_STATE_PENDING) {
       scr_log_print(LPRINT_DEBUG, "Delete %s!", sc->name);
       session_remove_sessioncontent(sess, sc->name);
     }
-  }*/
+  }
   
   // Go go go! We start jobs!
   for (el = sess->content; el; el = el->next) {
     sc = (SessionContent*)el->data;
-    sc2->sid = sess->sid;
-    sc2->from = (sess->origin == JINGLE_SESSION_INCOMING) ? sess->from : sess->to;
     sc2->name = sc->name;
     sc->appfuncs->start(sc2);
   }
-  jingle_free_jinglenode(jn);
 }
 
 void handle_session_terminate(JingleNode *jn)
@@ -269,5 +273,4 @@
   }
   session_delete(sess);
   jingle_ack_iq(jn->message);
-  jingle_free_jinglenode(jn);
 }

--- a/jingle/jingle.c	Sun Aug 15 11:42:10 2010 +0200
+++ b/jingle/jingle.c	Sun Aug 15 16:37:32 2010 +0200
@@ -119,7 +119,8 @@
       scr_log_print(LPRINT_DEBUG,
                     "jingle: %s", error->message);
     }
-    g_clear_error(&error);
+    g_error_free(error);
+    jingle_free_jinglenode(jn);
     return LM_HANDLER_RESULT_REMOVE_MESSAGE;
   }
 
@@ -127,11 +128,12 @@
 
   if (jingle_action_list[jn->action].handler == NULL) {
     jingle_send_iq_error(message, "cancel", "feature-not-implemented", NULL);
+    jingle_free_jinglenode(jn);
     return LM_HANDLER_RESULT_REMOVE_MESSAGE;
   }
 
   jingle_action_list[jn->action].handler(jn);
-
+  jingle_free_jinglenode(jn);
   return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 }
 

--- a/jingle/register.h	Sun Aug 15 11:42:10 2010 +0200
+++ b/jingle/register.h	Sun Aug 15 16:37:32 2010 +0200
@@ -48,6 +48,7 @@
 typedef const gchar* (*JingleTransportxmlns) (void);
 typedef gconstpointer (*JingleTransportNew) (void);
 typedef void (*JingleTransportSend) (session_content *sc, gconstpointer data, gchar *buf, gsize size);
+typedef void (*JingleTransportInit) (session_content *sc, gconstpointer data);
 typedef void (*JingleTransportEnd) (session_content *sc, gconstpointer data);
 
 typedef struct {
@@ -85,6 +86,8 @@
 
   JingleTransportSend send;
   
+  JingleTransportInit init;
+  
   JingleTransportEnd end;
 } JingleTransportFuncs;
 

--- a/jingle/send.c	Sun Aug 15 11:42:10 2010 +0200
+++ b/jingle/send.c	Sun Aug 15 16:37:32 2010 +0200
@@ -97,7 +97,8 @@
     ackhandle = g_new0(JingleAckHandle, 1);
     ackhandle->callback = jingle_handle_ack_iq_sa;
     ackhandle->user_data = (gpointer)js;
-    lm_connection_send_with_reply(lconnection, mess,
+        scr_log_print(LPRINT_DEBUG,
+                  "%s", lm_message_node_to_string(mess->node));lm_connection_send_with_reply(lconnection, mess,
                                   jingle_new_ack_handler(ackhandle), NULL);
     lm_message_unref(mess);
   }
@@ -136,7 +137,9 @@
     ackhandle = g_new0(JingleAckHandle, 1);
     ackhandle->callback = jingle_handle_ack_iq_si;
     ackhandle->user_data = (gpointer)js;
-    lm_connection_send_with_reply(lconnection, mess,
+    scr_log_print(LPRINT_DEBUG,
+                  "%s", lm_message_node_to_string(mess->node));
+lm_connection_send_with_reply(lconnection, mess,
                                   jingle_new_ack_handler(ackhandle), NULL);
     lm_message_unref(mess);
   }