--- a/jingle-filetransfer/filetransfer.c Mon Jul 26 02:56:15 2010 +0200
+++ b/jingle-filetransfer/filetransfer.c Mon Jul 26 11:41:52 2010 +0200
@@ -246,8 +246,6 @@
g_checksum_free(md5);
g_free(sid);
-
-
}
} else if (!g_strcmp0(args[0], "request")) {
scr_LogPrint(LPRINT_LOGNORM, "Jingle File Transfer: try to request %s!",
--- a/jingle/register.c Mon Jul 26 02:56:15 2010 +0200
+++ b/jingle/register.c Mon Jul 26 11:41:52 2010 +0200
@@ -112,8 +112,8 @@
{
AppHandlerEntry *app = jingle_find_app(appxmlns);
GSList *entry;
- TransportHandlerEntry *thistransport, *besttransport;
- JingleTransportPriority bestprio;
+ TransportHandlerEntry *thistransport, *besttransport = NULL;
+ JingleTransportPriority bestprio = JINGLE_TRANSPORT_NONE;
JingleTransportType requestedtype;
if (entry == NULL)
@@ -138,7 +138,7 @@
if (forbid != NULL)
*forbid = g_slist_append(*forbid, besttransport->xmlns);
- return besttransport->funcs;
+ return besttransport != NULL?besttransport->funcs:NULL;
}
/**
--- a/jingle/register.h Mon Jul 26 02:56:15 2010 +0200
+++ b/jingle/register.h Mon Jul 26 11:41:52 2010 +0200
@@ -29,6 +29,7 @@
* direct connection would have a high priority, since it would be the fastest.
*/
typedef enum {
+ JINGLE_TRANSPORT_NONE,
JINGLE_TRANSPORT_LOW,
JINGLE_TRANSPORT_NORMAL,
JINGLE_TRANSPORT_HIGH