start disco
authorNicolas Cornu <nicolas.cornu@ensi-bourges.fr>
Tue, 27 Jul 2010 12:18:06 +0200
changeset 77 56c6ab96026f
parent 76 42b487daee7d
child 78 0b138243bd4a
start disco
jingle-filetransfer/filetransfer.c
jingle/CMakeLists.txt
jingle/jingle.c
--- a/jingle-filetransfer/filetransfer.c	Mon Jul 26 11:41:52 2010 +0200
+++ b/jingle-filetransfer/filetransfer.c	Tue Jul 27 12:18:06 2010 +0200
@@ -219,6 +219,8 @@
       gchar *sid = new_sid();
       guchar data[1024];
       gsize bytes_read;
+      gchar *jid;
+      GSList *el;
       const gchar *jid = settings_opt_get("jid");
       JingleFT *jft = g_new0(JingleFT, 1);
       sess = session_new(sid, jid, jid);
@@ -242,8 +244,16 @@
       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, CURRENT_JID);
+      jid = CURRENT_JID;
+        
+      el = get_sorted_resources(jid);
+      if (el == NULL)
+        return;
+
+      jid = g_strdup_printf("%s/%s", jid, (gchar*)el->data);
+      jingle_handle_app(sess, "file", NS_JINGLE_APP_FT, jft, jid);
       
+      free_gslist_resources(el);
       g_checksum_free(md5);
       g_free(sid);
     }  
--- a/jingle/CMakeLists.txt	Mon Jul 26 11:41:52 2010 +0200
+++ b/jingle/CMakeLists.txt	Tue Jul 27 12:18:06 2010 +0200
@@ -1,4 +1,4 @@
-add_library(jingle MODULE jingle.c jingle.h check.c check.h action-handlers.c action-handlers.c register.c register.h sessions.c sessions.h send.c send.h)
+add_library(jingle MODULE disco.c disco.h jingle.c jingle.h check.c check.h action-handlers.c action-handlers.c register.c register.h sessions.c sessions.h send.c send.h)
 set_target_properties(jingle PROPERTIES COMPILE_FLAGS "-O0 -g")
 include_directories(${LM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
 target_link_libraries(jingle ${LM_LIBRARIES})
--- a/jingle/jingle.c	Mon Jul 26 11:41:52 2010 +0200
+++ b/jingle/jingle.c	Tue Jul 27 12:18:06 2010 +0200
@@ -377,7 +377,9 @@
     return NULL;
 
   g_slist_foreach(jn->content, lm_insert_jinglecontent, jnode);
-  return m;
+  scr_LogPrint(LPRINT_LOGNORM, "%s",
+                 lm_message_node_to_string(m->node));
+                 return m;
 }
 
 LmMessage *lm_message_from_jinglesession(const JingleSession *js,