jingle-filetransfer/filetransfer.c
changeset 32 72bbe33f151a
parent 31 02f5698ffa49
child 49 8dddfbe488b6
--- a/jingle-filetransfer/filetransfer.c	Mon Jul 05 00:52:27 2010 +0200
+++ b/jingle-filetransfer/filetransfer.c	Tue Jul 06 02:21:33 2010 +0200
@@ -34,7 +34,7 @@
 #include "filetransfer.h"
 
 
-gconstpointer jingle_ft_check(JingleContent *cn, GError **err, gpointer *data);
+gconstpointer jingle_ft_check(JingleContent *cn, GError **err);
 static void jingle_ft_init(void);
 static void jingle_ft_uninit(void);
 
@@ -55,26 +55,20 @@
 };
 
 
-gconstpointer jingle_ft_check(JingleContent *cn, GError **err, gpointer *data)
+gconstpointer jingle_ft_check(JingleContent *cn, GError **err)
 {
   JingleFT *ft = NULL;
-  LmMessageNode *node, *description;
+  LmMessageNode *node;
   const gchar *datestr, *sizestr;
 
-  description = lm_message_node_get_child(cn->node, "description");
-  if (!description) {
-    g_set_error(err, JINGLE_CHECK_ERROR, JINGLE_CHECK_ERROR_MISSING, "Huh ?");
-    return NULL;
-  }
-
-  node = lm_message_node_get_child(description, "offer");
+  node = lm_message_node_get_child(cn->description, "offer");
   if (!node) {
     g_set_error(err, JINGLE_CHECK_ERROR, JINGLE_CHECK_ERROR_MISSING,
                 "the offer element is missing");
     return NULL;
   }
 
-  node = lm_message_node_get_child(description, "file");
+  node = lm_message_node_get_child(cn->description, "file");
   if (!node) {
     g_set_error(err, JINGLE_CHECK_ERROR, JINGLE_CHECK_ERROR_MISSING,
                 "the file element is missing");
@@ -116,7 +110,7 @@
 
 static void jingle_ft_init(void)
 {
-  jingle_register_app(NS_JINGLE_APP_FT, &funcs, NULL);
+  jingle_register_app(NS_JINGLE_APP_FT, &funcs);
   xmpp_add_feature(NS_JINGLE_APP_FT);
 }