# HG changeset patch
# User Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
# Date 1281448598 -7200
# Node ID 88bb2d0f9ff872ea157e49a9d0a6a5c9014fa83d
# Parent  8b12ebd75c1a689761e3bc7fe00970c027954923
add an namespace to a jingle node

diff -r 8b12ebd75c1a -r 88bb2d0f9ff8 jingle-filetransfer/filetransfer.c
--- a/jingle-filetransfer/filetransfer.c	Tue Aug 10 02:06:46 2010 +0200
+++ b/jingle-filetransfer/filetransfer.c	Tue Aug 10 15:56:38 2010 +0200
@@ -231,9 +231,11 @@
       return;
     }
     ressource = jingle_find_compatible_res(CURRENT_JID, namespaces);
-    if (ressource == NULL)
+    if (ressource == NULL) {
+      scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: Cannot send file, because there is no ressource available");
       return;
-
+    }
+    
     recipientjid = g_strdup_printf("%s/%s", CURRENT_JID, ressource);
 
     sess = session_new(sid, myjid, recipientjid, JINGLE_SESSION_OUTGOING);
@@ -260,7 +262,6 @@
     g_io_channel_seek_position(jft->outfile, 0, G_SEEK_SET, NULL);*/
     session_add_app(sess, "file", NS_JINGLE_APP_FT, jft);
 
-
     jingle_handle_app(sess, "file", NS_JINGLE_APP_FT, jft, recipientjid);
 
     g_free(ressource);
diff -r 8b12ebd75c1a -r 88bb2d0f9ff8 jingle-ibb/ibb.c
--- a/jingle-ibb/ibb.c	Tue Aug 10 02:06:46 2010 +0200
+++ b/jingle-ibb/ibb.c	Tue Aug 10 15:56:38 2010 +0200
@@ -189,9 +189,11 @@
     return;
 
   LmMessageNode *node2 = lm_message_node_add_child(node, "transport", NULL);
+
   lm_message_node_set_attributes(node2, "xmlns", NS_JINGLE_TRANSPORT_IBB,
                                  "sid", jibb->sid,
-                                 "block-size", bsize);
+                                 "block-size", bsize,
+                                 NULL);
   g_free(bsize);
 }
 
diff -r 8b12ebd75c1a -r 88bb2d0f9ff8 jingle/jingle.c
--- a/jingle/jingle.c	Tue Aug 10 02:06:46 2010 +0200
+++ b/jingle/jingle.c	Tue Aug 10 15:56:38 2010 +0200
@@ -288,8 +288,6 @@
   roster_usr = buddy_search_jid(jid);
   reslist = buddy_getresources(roster_usr->data);
   for (thisres = reslist; thisres; thisres = g_slist_next(thisres)) {
-    choosenres = g_strdup(thisres->data);
-    return choosenres;
     found = TRUE;
     for (indexns = 0; ns[indexns]; indexns++) {
 	   if (!caps_has_feature(buddy_resource_getcaps(roster_usr->data, thisres->data), ns[indexns]))
@@ -302,6 +300,7 @@
     g_slist_free(reslist);
     return choosenres;
   }
+
   return NULL;
 }
 
diff -r 8b12ebd75c1a -r 88bb2d0f9ff8 jingle/send.c
--- a/jingle/send.c	Tue Aug 10 02:06:46 2010 +0200
+++ b/jingle/send.c	Tue Aug 10 15:56:38 2010 +0200
@@ -128,7 +128,8 @@
   JingleAckHandle *ackhandle;
   GSList *listentry;
   
-  LmMessage* mess = lm_message_from_jinglesession(js, js->to, JINGLE_SESSION_INITIATE);
+  LmMessage* mess = lm_message_from_jinglesession(js, js->to,
+                                                  JINGLE_SESSION_INITIATE);
 
   if (mess) {
     ackhandle = g_new0(JingleAckHandle, 1);
diff -r 8b12ebd75c1a -r 88bb2d0f9ff8 jingle/send.h
--- a/jingle/send.h	Tue Aug 10 02:06:46 2010 +0200
+++ b/jingle/send.h	Tue Aug 10 15:56:38 2010 +0200
@@ -4,7 +4,11 @@
 #include <glib.h>
 #include <loudmouth/loudmouth.h>
 
+#include <jingle/jingle.h>
+#include <jingle/sessions.h>
 
 void jingle_send_session_terminate(JingleNode *jn, const gchar *reason);
+void jingle_send_session_initiate(JingleSession *js);
+void jingle_send_session_accept(JingleNode *jn);
 
 #endif
diff -r 8b12ebd75c1a -r 88bb2d0f9ff8 jingle/sessions.c
--- a/jingle/sessions.c	Tue Aug 10 02:06:46 2010 +0200
+++ b/jingle/sessions.c	Tue Aug 10 15:56:38 2010 +0200
@@ -213,7 +213,7 @@
   
   session_add_trans(sess, name, trans->xmlns(), trans->new());
 
-  jingle_send_session_initiate(sess, to);
+  jingle_send_session_initiate(sess);
 }
 
 LmMessage *lm_message_from_jinglesession(const JingleSession *js,
@@ -228,6 +228,8 @@
                                    LM_MESSAGE_SUB_TYPE_SET);
   jnode = lm_message_node_add_child(m->node, "jingle", NULL);
 
+  lm_message_node_set_attribute(jnode, "xmlns", NS_JINGLE);
+  
   if (actionstr = jingle_action_list[action].name)
     lm_message_node_set_attribute(jnode, "action", actionstr);
   else